- up to 5.5.29

[packages/mysql.git] / optimizer_fix.patch

diff --git a/optimizer_fix.patch b/optimizer_fix.patch
index c6aceb30edf9eee29071bc854809bba36c886d88..c3dac078d0cd1d8cc3ce0173d66111dddf0c2abe 100644 (file)
--- a/optimizer_fix.patch
+++ b/optimizer_fix.patch
@@ -18,7 +18,7 @@
 +Ported to 5.1.42
 --- a/sql/mysqld.cc
 +++ b/sql/mysqld.cc
-@@ -430,6 +430,7 @@
+@@ -434,6 +434,7 @@
  MYSQL_PLUGIN_IMPORT uint    opt_debug_sync_timeout= 0;
  #endif /* defined(ENABLED_DEBUG_SYNC) */
  my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
@@ -138,7 +138,7 @@
    DBUG_RETURN(HA_POS_ERROR);                  /* This shouldn't happend */
 --- a/sql/sys_vars.cc
 +++ b/sql/sys_vars.cc
-@@ -2180,6 +2180,12 @@
+@@ -2259,6 +2259,12 @@
         VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
         DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));