← Back to branch summary

~sergei.glushchenko/percona-server/5.1.55-issue20632

« back to all changes in this revision

Viewing changes to optimizer_fix.patch

  • Committer: kinoyasu
  • Date: 2011-02-09 11:29:44 UTC
  • Revision ID: kinoyasu@gauntlet4-20110209112944-eeuv6cafcbit1jls
port Yasufumi patches to 5.1.55

Show diffs side-by-side

added added

removed removed

Lines of Context:
optimizer_fix.patch
20
20
diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
21
21
--- a/sql/mysql_priv.h  2010-07-26 18:29:12.224113574 +0900
22
22
+++ b/sql/mysql_priv.h  2010-07-26 18:29:35.697144981 +0900
23
 
@@ -2080,6 +2080,7 @@
 
23
@@ -2105,6 +2105,7 @@
24
24
 extern ulong slave_exec_mode_options;
25
25
 extern my_bool opt_readonly, lower_case_file_system;
26
26
 extern my_bool opt_userstat_running, opt_thread_statistics;
39
39
 /*
40
40
   True if there is at least one per-hour limit for some user, so we should
41
41
   check them before each query (and possibly reset counters when hour is
42
 
@@ -5823,6 +5824,7 @@
 
42
@@ -5825,6 +5826,7 @@
43
43
   OPT_SLOW_QUERY_LOG_FILE,
44
44
   OPT_USERSTAT_RUNNING,
45
45
   OPT_THREAD_STATISTICS,
47
47
   OPT_USE_GLOBAL_LONG_QUERY_TIME,
48
48
   OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
49
49
   OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
50
 
@@ -7324,6 +7326,10 @@
 
50
@@ -7326,6 +7328,10 @@
51
51
    "Control TABLE_STATISTICS running, when userstat_running is enabled",
52
52
    (uchar**) &opt_thread_statistics, (uchar**) &opt_thread_statistics,
53
53
    0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},
160
160
diff -ruN a/sql/sql_select.cc b/sql/sql_select.cc
161
161
--- a/sql/sql_select.cc 2010-07-26 18:23:40.015145156 +0900
162
162
+++ b/sql/sql_select.cc 2010-07-26 18:29:35.743144611 +0900
163
 
@@ -2596,6 +2596,11 @@
 
163
@@ -2597,6 +2597,11 @@
164
164
       table->reginfo.impossible_range=1;
165
165
       DBUG_RETURN(0);
166
166
     }