- not all chunks needed to patch

[packages/mysql.git] / query_cache_enhance.patch

diff --git a/query_cache_enhance.patch b/query_cache_enhance.patch
index e7fd078183ecb925daf832dd69a470fb7e34eac6..f39c5931a4fe7a0c5db7e67bc6f99a71bc918f8c 100644 (file)
--- a/query_cache_enhance.patch
+++ b/query_cache_enhance.patch
@@ -27,7 +27,7 @@ diff -ruN a/patch_info/query_cache_enhance.patch b/patch_info/query_cache_enhanc
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc    2010-11-03 03:01:14.000000000 +0500
 +++ b/sql/mysqld.cc    2010-11-13 15:34:40.000000000 +0500
-@@ -893,6 +893,7 @@
+@@ -896,6 +896,7 @@
  #endif
  #ifdef HAVE_QUERY_CACHE
  ulong query_cache_min_res_unit= QUERY_CACHE_MIN_RESULT_DATA_SIZE;
@@ -464,7 +464,7 @@ diff -ruN a/sql/sql_class.h b/sql/sql_class.h
  
  class Reprepare_observer;
  class Relay_log_info;
-@@ -758,6 +761,9 @@
+@@ -765,6 +768,9 @@
      statement lifetime. FIXME: must be const
    */
     ulong id;
@@ -477,7 +477,7 @@ diff -ruN a/sql/sql_class.h b/sql/sql_class.h
 diff -ruN a/sql/sys_vars.cc b/sql/sys_vars.cc
 --- a/sql/sys_vars.cc  2010-11-03 03:01:14.000000000 +0500
 +++ b/sql/sys_vars.cc  2010-11-13 15:34:59.000000000 +0500
-@@ -1724,6 +1724,11 @@
+@@ -1740,6 +1740,11 @@
         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_query_cache_size));