Merge lp:~stewart/percona-server/5.5-bug986247-remove-optimizer-fix into lp:percona-server/5.5

[Stewart Smith]

Remove optimizer_fix in 5.5, based on 5.5 patch that was imported into BZR (not the 5.1 one).

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/602/

[George Ormond Lorch III (gl-az)]

review: Approve (g2)

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

[Stewart Smith (stewart)]

Actually causes this test failure:
CURRENT_TEST: main.select
--- /home/jenkins/workspace/merge-PS-5.5-staging/BUILD_TYPE/release/Host/debian6-32/Percona-Server/mysql-test/r/select.result 2013-01-08 04:07:21.279947000 +0300
+++ /home/jenkins/workspace/merge-PS-5.5-staging/BUILD_TYPE/release/Host/debian6-32/Percona-Server/mysql-test/r/select.reject 2013-01-11 04:04:48.267403445 +0300
@@ -2196,10 +2196,10 @@
 select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 on t1.a>1;
 a a
 1 2
-1 3
 2 2
-2 3
 3 2
+1 3
+2 3
 3 3
 select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1;
 a a

mysqltest: Result content mismatch

Which is the inverse of this revision:

        revno: 0.16401.242
        revision-id: <email address hidden>
        parent: <email address hidden>
        committer: Stewart Smith <email address hidden>
        branch nick: percona-server-5.1
        timestamp: Thu 2011-11-24 13:00:56 +1100
        message:
          Import Percona Server patch: mysql-test.diff
        diff:
        === modified file 'Percona-Server/mysql-test/r/select.result'
        --- Percona-Server/mysql-test/r/select.result 2010-06-24 08:00:48 +0000
        +++ Percona-Server/mysql-test/r/select.result 2011-11-24 02:00:56 +0000
        @@ -2196,10 +2196,10 @@
         select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 on t1.a>1;
         a a
         1 2
        +1 3
         2 2
        +2 3
         3 2
        -1 3
        -2 3
         3 3
         select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t

=== modified file 'Percona-Server/mysql-test/r/select.result'
--- Percona-Server/mysql-test/r/select.result	2012-06-05 10:36:15 +0000
+++ Percona-Server/mysql-test/r/select.result	2013-02-06 01:21:25 +0000
@@ -2196,10 +2196,10 @@
 select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 on t1.a>1;
 a	a
 1	2
+2	2
+3	2
 1	3
-2	2
 2	3
-3	2
 3	3
 select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1;
 a	a

=== removed file 'Percona-Server/patch_info/optimizer_fix.info'
--- Percona-Server/patch_info/optimizer_fix.info	2012-04-18 23:24:38 +0000
+++ Percona-Server/patch_info/optimizer_fix.info	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-File=optimizer_fix.patch
-Name=Unofficial optimizer fixes
-Version=1.0
-Author=Percona <[e-mail]>
-License=GPL
-Comment=
-2010-01
-Ported to 5.1.42

=== modified file 'Percona-Server/sql/opt_range.cc'
--- Percona-Server/sql/opt_range.cc	2013-01-09 23:45:25 +0000
+++ Percona-Server/sql/opt_range.cc	2013-02-06 01:21:25 +0000
@@ -728,7 +728,7 @@
 static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
                                        bool index_read_must_be_used,
                                        bool update_tbl_stats,
-                                       double read_time, ha_rows *estimated_records);
+                                       double read_time);
 static
 TRP_ROR_INTERSECT *get_best_ror_intersect(const PARAM *param, SEL_TREE *tree,
                                           double read_time,
@@ -2154,7 +2154,6 @@
 				  ha_rows limit, bool force_quick_range)
 {
   uint idx;
-  ha_rows estimated_records=0;
   double scan_time;
   DBUG_ENTER("SQL_SELECT::test_quick_select");
   DBUG_PRINT("enter",("keys_to_use: %lu  prev_tables: %lu  const_tables: %lu",
@@ -2323,17 +2322,12 @@
 
         /* Get best 'range' plan and prepare data for making other plans */
         if ((range_trp= get_key_scans_params(&param, tree, FALSE, TRUE,
-                                             best_read_time, &estimated_records)))
+                                             best_read_time)))
         {
           best_trp= range_trp;
           best_read_time= best_trp->read_cost;
         }
 
-        if (opt_optimizer_fix && estimated_records)
-        {
-          records = estimated_records;
-        }
-
         /*
           Simultaneous key scans and row deletes on several handler
           objects are not allowed so don't use ROR-intersection for
@@ -3837,7 +3831,7 @@
   {
     DBUG_EXECUTE("info", print_sel_tree(param, *ptree, &(*ptree)->keys_map,
                                         "tree in SEL_IMERGE"););
-    if (!(*cur_child= get_key_scans_params(param, *ptree, TRUE, FALSE, read_time, NULL)))
+    if (!(*cur_child= get_key_scans_params(param, *ptree, TRUE, FALSE, read_time)))
     {
       /*
         One of index scans in this index_merge is more expensive than entire
@@ -4940,12 +4934,11 @@
 static TRP_RANGE *get_key_scans_params(PARAM *param, SEL_TREE *tree,
                                        bool index_read_must_be_used, 
                                        bool update_tbl_stats,
-                                       double read_time, ha_rows *estimated_records)
+                                       double read_time)
 {
   int idx;
   SEL_ARG **key,**end, **key_to_read= NULL;
   ha_rows UNINIT_VAR(best_records);              /* protected by key_to_read */
-  ha_rows min_records= HA_POS_ERROR;
   TRP_RANGE* read_plan= NULL;
   bool pk_is_clustered= param->table->file->primary_key_is_clustered();
   DBUG_ENTER("get_key_scans_params");
@@ -5016,11 +5009,6 @@
         key_to_read=  key;
       }
 
-      if (estimated_records && found_records
-          && min_records > found_records)
-      {
-        min_records = found_records;
-      }
     }
   }
 
@@ -5043,12 +5031,6 @@
   else
     DBUG_PRINT("info", ("No 'range' table read plan found"));
 
-  /* minimum number of records (not 0) as estimated number of records */
-  if (estimated_records && min_records != HA_POS_ERROR)
-  {
-    *estimated_records = min_records;
-  }
-
   DBUG_RETURN(read_plan);
 }
 

=== modified file 'Percona-Server/sql/sql_select.cc'
--- Percona-Server/sql/sql_select.cc	2013-01-17 22:50:22 +0000
+++ Percona-Server/sql/sql_select.cc	2013-02-06 01:21:25 +0000
@@ -2652,11 +2652,6 @@
       table->reginfo.impossible_range=1;
       DBUG_RETURN(0);
     }
-    if (opt_optimizer_fix && error == 0)
-    {
-      /* quick select is not effective. but the estimated value is used. */
-      DBUG_RETURN(select->records);
-    }
     DBUG_PRINT("warning",("Couldn't use record count on const keypart"));
   }
   DBUG_RETURN(HA_POS_ERROR);			/* This shouldn't happend */

=== modified file 'Percona-Server/sql/sys_vars.cc'
--- Percona-Server/sql/sys_vars.cc	2012-10-17 03:47:45 +0000
+++ Percona-Server/sql/sys_vars.cc	2013-02-06 01:21:25 +0000
@@ -2364,7 +2364,8 @@
 
 static Sys_var_mybool Sys_optimizer_fix(
        "optimizer_fix",
-       "Enable unofficial optimizer fixes.",
+       "OBSOLETE: only here for compatibility with old Percona Server "
+       "releases, does nothing.",
        GLOBAL_VAR(opt_optimizer_fix),
        NO_CMD_LINE, DEFAULT(TRUE));