Merge branch 'mysql-5.6' into mysql-5.7

Author: phulakun

sql/sp_instr.cc

@@ -261,6 +261,35 @@ static bool subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str)
 ///////////////////////////////////////////////////////////////////////////
 
 
+class SP_instr_error_handler : public Internal_error_handler
+{
+public:
+  SP_instr_error_handler()
+    : cts_table_exists_error(false)
+  {}
+
+  virtual bool handle_condition(THD *thd,
+                                uint sql_errno,
+                                const char*,
+                                Sql_condition::enum_severity_level*,
+                                const char*)
+  {
+    /*
+      Check if the "table exists" error or warning reported for the
+      CREATE TABLE ... SELECT statement.
+    */
+    if (thd->lex && thd->lex->sql_command == SQLCOM_CREATE_TABLE &&
+        thd->lex->select_lex && thd->lex->select_lex->item_list.elements > 0 &&
+        sql_errno == ER_TABLE_EXISTS_ERROR)
+      cts_table_exists_error= true;
+
+    return false;
+  }
+
+  bool cts_table_exists_error;
+};
+
+
 bool sp_lex_instr::reset_lex_and_exec_core(THD *thd,
                                            uint *nextp,
                                            bool open_tables)
@@ -336,6 +365,9 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd,
     thd->lex->safe_to_cache_query= 0;
 #endif
 
+  SP_instr_error_handler sp_instr_error_handler;
+  thd->push_internal_handler(&sp_instr_error_handler);
+
   /* Open tables if needed. */
 
   if (!error)
@@ -413,6 +445,9 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd,
     }
   }
 
+  // Pop SP_instr_error_handler error handler.
+  thd->pop_internal_handler();
+
   if (m_lex->query_tables_own_last)
   {
     /*
@@ -451,7 +486,8 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd,
     See Query_arena->state definition for explanation.
 
     Some special handling of CREATE TABLE .... SELECT in an SP is required. The
-    state is always set to STMT_INITIALIZED_FOR_SP in such a case.
+    state is set to STMT_INITIALIZED_FOR_SP even in case of "table exists"
+    error situation.
 
     Why is this necessary? A useful pointer would be to note how
     PREPARE/EXECUTE uses functions like select_like_stmt_test to implement
@@ -467,12 +503,10 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd,
   */
 
   bool reprepare_error=
-    error && thd->get_stmt_da()->mysql_errno() == ER_NEED_REPREPARE;
-  bool is_create_table_select=
-    thd->lex && thd->lex->sql_command == SQLCOM_CREATE_TABLE &&
-    thd->lex->select_lex && thd->lex->select_lex->item_list.elements > 0;
+    error && thd->is_error() &&
+    thd->get_stmt_da()->mysql_errno() == ER_NEED_REPREPARE;
 
-  if (reprepare_error || is_create_table_select)
+  if (reprepare_error || sp_instr_error_handler.cts_table_exists_error)
     thd->stmt_arena->state= Query_arena::STMT_INITIALIZED_FOR_SP;
   else if (!error || !thd->is_error() ||
            (thd->get_stmt_da()->mysql_errno() != ER_CANT_REOPEN_TABLE &&