- up to 5.5.11

[packages/mysql.git] / query_cache_enhance.patch

diff --git a/query_cache_enhance.patch b/query_cache_enhance.patch
index 144892303c5f680f2697580b36d73a8dbe6dd922..8b3132c5e60ab24efdb446f61b57afebb289e0e1 100644 (file)
--- a/query_cache_enhance.patch
+++ b/query_cache_enhance.patch
@@ -5,9 +5,9 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/patch_info/query_cache_enhance.patch b/patch_info/query_cache_enhance.patch
---- a/patch_info/query_cache_enhance.patch     1970-01-01 05:00:00.000000000 +0500
-+++ b/patch_info/query_cache_enhance.patch     2010-11-12 17:24:47.000000000 +0500
+diff -ruN /dev/null b/patch_info/query_cache_enhance.patch
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ b/patch_info/query_cache_enhance.patch     2011-04-09 18:48:53.000000000 +0400
 @@ -0,0 +1,15 @@
 +File=query_cache_enhance.patch
 +Name= query cache Percona's cumulative patch
@@ -25,9 +25,9 @@ diff -ruN a/patch_info/query_cache_enhance.patch b/patch_info/query_cache_enhanc
 +2010-09 - Merge patches to one
 +2010-11 - Ported to 5.5
 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
-@@ -897,6 +897,7 @@
+--- a/sql/mysqld.cc    2011-04-09 18:48:50.000000000 +0400
++++ b/sql/mysqld.cc    2011-04-09 18:48:53.000000000 +0400
+@@ -903,6 +903,7 @@
  #endif
  #ifdef HAVE_QUERY_CACHE
  ulong query_cache_min_res_unit= QUERY_CACHE_MIN_RESULT_DATA_SIZE;
@@ -36,8 +36,8 @@ diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
  #endif
  #ifdef HAVE_SMEM
 diff -ruN a/sql/mysqld.h b/sql/mysqld.h
---- a/sql/mysqld.h     2010-11-03 03:01:14.000000000 +0500
-+++ b/sql/mysqld.h     2010-11-13 15:34:36.000000000 +0500
+--- a/sql/mysqld.h     2011-04-09 18:48:50.000000000 +0400
++++ b/sql/mysqld.h     2011-04-09 18:48:53.000000000 +0400
 @@ -91,6 +91,7 @@
  extern my_bool opt_log, opt_slow_log;
  extern my_bool opt_backup_history_log;
@@ -46,9 +46,9 @@ diff -ruN a/sql/mysqld.h b/sql/mysqld.h
  extern ulonglong log_output_options;
  extern ulong log_backup_output_options;
  extern my_bool opt_log_queries_not_using_indexes;
-diff -ruN a/sql/query_strip_comments.h b/sql/query_strip_comments.h
---- a/sql/query_strip_comments.h       1970-01-01 05:00:00.000000000 +0500
-+++ b/sql/query_strip_comments.h       2010-11-12 17:24:47.000000000 +0500
+diff -ruN /dev/null b/sql/query_strip_comments.h
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ b/sql/query_strip_comments.h       2011-04-09 18:48:53.000000000 +0400
 @@ -0,0 +1,37 @@
 +#ifndef _SQL_QUERY_STRIPC_COMMENTS_H_
 +#define _SQL_QUERY_STRIPC_COMMENTS_H_
@@ -88,8 +88,8 @@ diff -ruN a/sql/query_strip_comments.h b/sql/query_strip_comments.h
 +#endif // HAVE_QUERY_CACHE
 +#endif // _SQL_QUERY_STRIPC_COMMENTS_H_
 diff -ruN a/sql/sql_cache.cc b/sql/sql_cache.cc
---- a/sql/sql_cache.cc 2010-11-03 03:01:14.000000000 +0500
-+++ b/sql/sql_cache.cc 2010-11-12 17:24:47.000000000 +0500
+--- a/sql/sql_cache.cc 2011-04-09 18:48:50.000000000 +0400
++++ b/sql/sql_cache.cc 2011-04-09 18:48:53.000000000 +0400
 @@ -344,6 +344,181 @@
  #include "probes_mysql.h"
  #include "transaction.h"
@@ -452,8 +452,8 @@ diff -ruN a/sql/sql_cache.cc b/sql/sql_cache.cc
    if (query_block == 0 ||
        query_block->query()->result() == 0 ||
 diff -ruN a/sql/sql_class.h b/sql/sql_class.h
---- a/sql/sql_class.h  2010-11-03 03:01:14.000000000 +0500
-+++ b/sql/sql_class.h  2010-11-13 15:34:25.000000000 +0500
+--- a/sql/sql_class.h  2011-04-09 18:48:50.000000000 +0400
++++ b/sql/sql_class.h  2011-04-09 18:48:53.000000000 +0400
 @@ -40,6 +40,9 @@
  #include "thr_lock.h"             /* thr_lock_type, THR_LOCK_DATA,
                                       THR_LOCK_INFO */
@@ -475,9 +475,9 @@ diff -ruN a/sql/sql_class.h b/sql/sql_class.h
    /*
      MARK_COLUMNS_NONE:  Means mark_used_colums is not set and no indicator to
 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
-@@ -1740,6 +1740,11 @@
+--- a/sql/sys_vars.cc  2011-04-09 18:48:50.000000000 +0400
++++ b/sql/sys_vars.cc  2011-04-09 18:48:53.000000000 +0400
+@@ -1750,6 +1750,11 @@
         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_query_cache_size));