~vlad-lesin/percona-server/pintables

« back to all changes in this revision

Viewing changes to optimizer_fix.patch

  • Committer: Laurynas Biveinis
  • Date: 2011-06-21 02:36:36 UTC
  • mfrom: (123 merge)
  • mto: This revision was merged to the branch mainline in revision 124.
  • Revision ID: laurynas.biveinis@percona.com-20110621023636-ccp1iyyrncj181zt
MergeĀ fromĀ lp:percona-server

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
21
21
--- a/sql/mysqld.cc     2010-12-02 19:22:40.027024953 +0900
22
22
+++ b/sql/mysqld.cc     2010-12-02 20:51:50.811356434 +0900
23
 
@@ -429,6 +429,7 @@
 
23
@@ -425,6 +425,7 @@
24
24
 uint    opt_debug_sync_timeout= 0;
25
25
 #endif /* defined(ENABLED_DEBUG_SYNC) */
26
26
 my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
129
129
diff -ruN a/sql/sql_select.cc b/sql/sql_select.cc
130
130
--- a/sql/sql_select.cc 2010-11-03 07:01:14.000000000 +0900
131
131
+++ b/sql/sql_select.cc 2010-12-02 20:47:55.813953789 +0900
132
 
@@ -2615,6 +2615,11 @@
 
132
@@ -2619,6 +2619,11 @@
133
133
       table->reginfo.impossible_range=1;
134
134
       DBUG_RETURN(0);
135
135
     }