fix for Bug#13820776 CRASH IN HANDLER::HA_STATISTIC_INCREMENT IF QUERY IS KILLED

Author: Guilhem Bichot

mysql-test/r/kill_debug.result

@@ -0,0 +1,21 @@
+SET @old_debug= @@session.debug;
+Bug#13820776 CRASH IN HANDLER::HA_STATISTIC_INCREMENT IF QUERY IS KILLED
+CREATE TABLE g9(a INT) ENGINE=INNODB;
+SELECT 1 FROM g9
+RIGHT JOIN (SELECT 1 FROM g9) AS d1 ON 1 LEFT JOIN
+(SELECT 1 FROM g9) AS d2 ON 1;
+1
+SET debug= '+d,bug13820776_1';
+SELECT 1 FROM g9
+RIGHT JOIN (SELECT 1 FROM g9) AS d1 ON 1 LEFT JOIN
+(SELECT 1 FROM g9) AS d2 ON 1;
+ERROR 70100: Query execution was interrupted
+SET debug= '-d,bug13820776_1';
+SET debug= '+d,bug13820776_2';
+SELECT 1 FROM g9
+RIGHT JOIN (SELECT 1 FROM g9) AS d1 ON 1 LEFT JOIN
+(SELECT 1 FROM g9) AS d2 ON 1;
+ERROR 70100: Query execution was interrupted
+SET debug= '-d,bug13820776_2';
+DROP TABLE g9;
+SET debug= @old_debug;

mysql-test/t/kill_debug.test

@@ -0,0 +1,26 @@
+--source include/have_debug.inc
+
+SET @old_debug= @@session.debug;
+
+--echo Bug#13820776 CRASH IN HANDLER::HA_STATISTIC_INCREMENT IF QUERY IS KILLED
+
+CREATE TABLE g9(a INT) ENGINE=INNODB;
+
+let $query=SELECT 1 FROM g9
+RIGHT JOIN (SELECT 1 FROM g9) AS d1 ON 1 LEFT JOIN
+(SELECT 1 FROM g9) AS d2 ON 1;
+
+eval $query;
+
+SET debug= '+d,bug13820776_1';
+--error ER_QUERY_INTERRUPTED
+eval $query;
+SET debug= '-d,bug13820776_1';
+
+SET debug= '+d,bug13820776_2';
+--error ER_QUERY_INTERRUPTED
+eval $query;
+SET debug= '-d,bug13820776_2';
+
+DROP TABLE g9;
+SET debug= @old_debug;

sql/sql_optimizer.cc

@@ -151,7 +151,8 @@ JOIN::optimize()
     Run optimize phase for all derived tables/views used in this SELECT,
     including those in semi-joins.
   */
-  select_lex->handle_derived(thd->lex, &mysql_derived_optimize);
+  if (select_lex->handle_derived(thd->lex, &mysql_derived_optimize))
+    DBUG_RETURN(1);
 
   /* dump_TABLE_LIST_graph(select_lex, select_lex->leaf_tables); */
 
@@ -3406,8 +3407,12 @@ make_join_statistics(JOIN *join, TABLE_LIST *tables_arg, Item *conds,
   if (optimize_semijoin_nests_for_materialization(join))
     DBUG_RETURN(true);
 
-  if (Optimize_table_order(thd, join, NULL).choose_table_order() || thd->killed)
-      DBUG_RETURN(true);
+  if (Optimize_table_order(thd, join, NULL).choose_table_order())
+    DBUG_RETURN(true);
+
+  DBUG_EXECUTE_IF("bug13820776_1", thd->killed= THD::KILL_QUERY;);
+  if (thd->killed)
+    DBUG_RETURN(true);
 
   /* Generate an execution plan from the found optimal join order. */
   if (join->get_best_combination())

sql/sql_planner.cc

@@ -1754,6 +1754,7 @@ bool Optimize_table_order::best_extension_by_limited_search(
 {
   DBUG_ENTER("Optimize_table_order::best_extension_by_limited_search");
 
+  DBUG_EXECUTE_IF("bug13820776_2", thd->killed= THD::KILL_QUERY;);
   if (thd->killed)  // Abort
     DBUG_RETURN(true);
   Opt_trace_context * const trace= &thd->opt_trace;