- up to 5.5.11

[packages/percona-server.git] / optimizer_fix.patch

diff --git a/optimizer_fix.patch b/optimizer_fix.patch
index 95165421c46a7230cbbb53c92e91998998b5ef25..5bdbaa3f4b404fcb38b16dbc58950514a142cfc7 100644 (file)
--- a/optimizer_fix.patch
+++ b/optimizer_fix.patch
@@ -20,7 +20,7 @@ diff -ruN /dev/null b/patch_info/optimizer_fix.info
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc    2010-12-02 19:22:40.027024953 +0900
 +++ b/sql/mysqld.cc    2010-12-02 20:51:50.811356434 +0900
-@@ -428,6 +428,7 @@
+@@ -429,6 +429,7 @@
  uint    opt_debug_sync_timeout= 0;
  #endif /* defined(ENABLED_DEBUG_SYNC) */
  my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
@@ -129,7 +129,7 @@ diff -ruN a/sql/opt_range.cc b/sql/opt_range.cc
 diff -ruN a/sql/sql_select.cc b/sql/sql_select.cc
 --- a/sql/sql_select.cc        2010-11-03 07:01:14.000000000 +0900
 +++ b/sql/sql_select.cc        2010-12-02 20:47:55.813953789 +0900
-@@ -2611,6 +2611,11 @@
+@@ -2615,6 +2615,11 @@
        table->reginfo.impossible_range=1;
        DBUG_RETURN(0);
      }
@@ -144,7 +144,7 @@ diff -ruN a/sql/sql_select.cc b/sql/sql_select.cc
 diff -ruN a/sql/sys_vars.cc b/sql/sys_vars.cc
 --- a/sql/sys_vars.cc  2010-12-02 20:31:56.208023606 +0900
 +++ b/sql/sys_vars.cc  2010-12-02 21:17:44.618120277 +0900
-@@ -2134,6 +2134,12 @@
+@@ -2144,6 +2144,12 @@
         VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
         DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));