Bug#25583588 : `M_PREBUILT->TABLE->N_REF_COUNT > 0' AT

                HA_INNOBASE::UPDATE_THD IN HANDLER

Post push patch:

After pushing fix for bug#25583588, server does not show hidden tables
even with the I_S implementation that uses ST_SCHEMA_TABLE interface.
This affects the test case added by Bug#22285643, which uses
I_S.PARTITIONS to check if there exists a hidden table. This leads
to the timeout of the test.

Remove the test case and debug points introduced in the code
for this test.

Author: abhi5466

mysql-test/r/alter_table-big.result

@@ -76,93 +76,6 @@ master-bin.000001	#	Query	#	#	use `test`; rename table t1 to t3
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t3` /* generated by server */
 End of 5.1 tests
 #
-# Bug#22681959 : SELECT ON I_S TABLES WITH CONCURRENT DDL MAY CRASH SERVER
-# Bug#22285643 : I_S QUERIES OPENING TMP TABLES FROM ALTER INVALIDATES REFERENCE COUNTER
-#
-SET DEBUG_SYNC= 'RESET';
-DROP SCHEMA IF EXISTS test_i_s;
-CREATE SCHEMA test_i_s;
-USE test_i_s;
-CREATE TABLE t1(a INT) ENGINE=MYISAM;
-# Create new connections
-connect  con1,localhost,root,,;
-connect  con2,localhost,root,,;
-connect  con3,localhost,root,,;
-connect  con4,localhost,root,,;
-connect  con5,localhost,root,,;
-connection default;
-SET GLOBAL DEBUG='d,alter_table_after_rename';
-SET DEBUG_SYNC=
-'before_rename_in_dd SIGNAL blocked WAIT_FOR i_s_select';
-SET DEBUG_SYNC=
-'after_rename_in_dd SIGNAL blocked_2 WAIT_FOR i_s_select_2';
-# Sending ALTER Command
-ALTER TABLE t1 add column (c2 int);;
-connection con1;
-SET DEBUG_SYNC= 'now WAIT_FOR blocked';
-SET DEBUG_SYNC=
-'show_after_table_list_prep SIGNAL i_s_select WAIT_FOR blocked_2';
-SELECT table_name FROM information_schema.partitions WHERE SUBSTR(table_name,1,1)='#';;
-connection con2;
-SET DEBUG_SYNC= 'now SIGNAL i_s_select_2';
-connection default;
-#Reaping "ALTER ..."
-connection con1;
-#Reaping "SELECT"
-table_name
-SET DEBUG_SYNC= 'RESET';
-SET GLOBAL DEBUG='';
-connection con3;
-USE test_i_s;
-SET GLOBAL DEBUG='d,alter_table_after_rename';
-SET DEBUG_SYNC=
-'before_rename_in_dd SIGNAL blocked WAIT_FOR i_s_select';
-# Sending:
-ALTER TABLE t1 add column (c3 int);
-connection con4;
-SET DEBUG_SYNC= 'now WAIT_FOR blocked';
-SET DEBUG_SYNC=
-'after_acquire_abstract_table SIGNAL i_s_select WAIT_FOR blocked_2';
-SELECT table_name FROM information_schema.partitions WHERE table_schema='test_i_s' and table_name LIKE '#sql%\_%';
-connection con5;
-SET DEBUG_SYNC= 'now SIGNAL i_s_select';
-connection con3;
-#Reaping "ALTER ..."
-SET DEBUG_SYNC= 'now SIGNAL blocked_2';
-connection con4;
-#Reaping "SELECT"
-table_name
-connection default;
-SET DEBUG_SYNC= 'RESET';
-SET GLOBAL DEBUG='';
-connection default;
-USE test_i_s;
-CREATE TABLE pid_table(pid_no INT);
-SET @conn_id= connection_id();
-LOAD DATA LOCAL INFILE 'pid_file' INTO TABLE pid_table;
-connection con1;
-use test_i_s;
-connection default;
-SET @lock_wait_timeout_saved= @@lock_wait_timeout;
-SET lock_wait_timeout = 1;
-ALTER TABLE t1 add column (c4 int);
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
-connection con1;
-UNLOCK TABLES;
-connection default;
-SET lock_wait_timeout = 1;
-ALTER TABLE t1 add column (c4 int);
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
-connection con1;
-disconnect con1;
-disconnect con2;
-disconnect con3;
-disconnect con4;
-disconnect con5;
-connection default;
-DROP SCHEMA test_i_s;
-SET @@lock_wait_timeout= @lock_wait_timeout_saved;
-#
 # Additional coverage for WL#7743 "New data dictionary: changes
 # to DDL-related parts of SE API".
 #

mysql-test/t/alter_table-big.test

@@ -178,180 +178,6 @@ source include/show_binlog_events.inc;
 --source include/restore_default_binlog_format.inc
 
 
---echo #
---echo # Bug#22681959 : SELECT ON I_S TABLES WITH CONCURRENT DDL MAY CRASH SERVER
---echo # Bug#22285643 : I_S QUERIES OPENING TMP TABLES FROM ALTER INVALIDATES REFERENCE COUNTER
---echo #
-
-#
-# Preparative cleanup.
-#
---disable_warnings
-SET DEBUG_SYNC= 'RESET';
-DROP SCHEMA IF EXISTS test_i_s;
---enable_warnings
-
-#
-# This is test case to check assert in Bug#22681959.
-#
-CREATE SCHEMA test_i_s;
-USE test_i_s;
-CREATE TABLE t1(a INT) ENGINE=MYISAM;
-
---echo # Create new connections
---enable_connect_log
-connect (con1,localhost,root,,);
-connect (con2,localhost,root,,);
-connect (con3,localhost,root,,);
-connect (con4,localhost,root,,);
-connect (con5,localhost,root,,);
-
---connection default
-SET GLOBAL DEBUG='d,alter_table_after_rename';
-SET DEBUG_SYNC=
-  'before_rename_in_dd SIGNAL blocked WAIT_FOR i_s_select';
-SET DEBUG_SYNC=
-  'after_rename_in_dd SIGNAL blocked_2 WAIT_FOR i_s_select_2';
-
---echo # Sending ALTER Command
---send ALTER TABLE t1 add column (c2 int);
-
---connection con1
-SET DEBUG_SYNC= 'now WAIT_FOR blocked';
-SET DEBUG_SYNC=
-  'show_after_table_list_prep SIGNAL i_s_select WAIT_FOR blocked_2';
---send SELECT table_name FROM information_schema.partitions WHERE SUBSTR(table_name,1,1)='#';
-
---connection con2
-# Without Fix, ALTER command gets signal to continue from above.
-# It asserts trying to put dd::Table object in the Dictionary Cache.
-# With the Fix, ALTER gets MDL on the temporary table name.
-# SELECT on I_S waits for ALTER to finish.
-let $wait_condition=
-  select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table metadata lock" and
-         info = "SELECT table_name FROM information_schema.partitions WHERE SUBSTR(table_name,1,1)='#'";
---source include/wait_condition.inc
-SET DEBUG_SYNC= 'now SIGNAL i_s_select_2';
-
---connection default
---echo #Reaping "ALTER ..."
---reap
-
---connection con1
---echo #Reaping "SELECT"
---reap
-
-SET DEBUG_SYNC= 'RESET';
-SET GLOBAL DEBUG='';
-
-#
-# This is test case to check assert in Bug#22285643.
-#
-
---connection con3
-USE test_i_s;
-
-SET GLOBAL DEBUG='d,alter_table_after_rename';
-SET DEBUG_SYNC=
-  'before_rename_in_dd SIGNAL blocked WAIT_FOR i_s_select';
-
---echo # Sending:
---send ALTER TABLE t1 add column (c3 int)
-
---connection con4
-SET DEBUG_SYNC= 'now WAIT_FOR blocked';
-SET DEBUG_SYNC=
-  'after_acquire_abstract_table SIGNAL i_s_select WAIT_FOR blocked_2';
-
---send SELECT table_name FROM information_schema.partitions WHERE table_schema='test_i_s' and table_name LIKE '#sql%\_%'
-
---connection con5
-let $wait_condition=
-  select count(*) = 1 from information_schema.processlist
-  where state = "Waiting for table metadata lock" and
-         info LIKE "SELECT table_name FROM information_schema.partitions WHERE table_schema='test_i_s' and table_name LI%";
---source include/wait_condition.inc
-SET DEBUG_SYNC= 'now SIGNAL i_s_select';
-
---connection con3
---echo #Reaping "ALTER ..."
---reap
-SET DEBUG_SYNC= 'now SIGNAL blocked_2';
-
---connection con4
---echo #Reaping "SELECT"
---reap
-
---connection default
-SET DEBUG_SYNC= 'RESET';
-SET GLOBAL DEBUG='';
-
-
-#
-# This is test case to check error paths in Bug#22681959 and Bug#22285643.
-#
-
---connection default
-USE test_i_s;
-CREATE TABLE pid_table(pid_no INT);
-
-SET @conn_id= connection_id();
---let $pid_file=`SELECT @@pid_file`
---replace_result $pid_file pid_file
---eval LOAD DATA LOCAL INFILE '$pid_file' INTO TABLE pid_table
---let $temp_table_name= `SELECT CONCAT('#sql-', LCASE(HEX(pid_no)), '_', @conn_id) FROM pid_table`
---let $temp_table_backup_name= `SELECT CONCAT('#sql2-', LCASE(HEX(pid_no)), '-', @conn_id) FROM pid_table`
-
-# Lock the temporary table name to be used while ALTER
---connection con1
-use test_i_s;
---disable_query_log
-eval CREATE  TABLE `$temp_table_name`(a int);
-eval LOCK TABLE `$temp_table_name` WRITE;
---enable_query_log
-
-# ALTER will timeout while trying to get MDL on temporary table name.
---connection default
-SET @lock_wait_timeout_saved= @@lock_wait_timeout;
-SET lock_wait_timeout = 1;
---error ER_LOCK_WAIT_TIMEOUT
-ALTER TABLE t1 add column (c4 int);
-
-# Lock the backup temporary table name to be used while ALTER
---connection con1
-UNLOCK TABLES;
---disable_query_log
-eval DROP  TABLE `$temp_table_name`;
-eval CREATE  TABLE `$temp_table_backup_name`(a int);
-eval LOCK TABLE `$temp_table_backup_name` WRITE;
---enable_query_log
-
-# ALTER will timeout while trying to get MDL on backup temporary table name.
---connection default
-SET lock_wait_timeout = 1;
---error ER_LOCK_WAIT_TIMEOUT
-ALTER TABLE t1 add column (c4 int);
-
---connection con1
---disable_query_log
-eval DROP  TABLE `$temp_table_backup_name`;
---enable_query_log
---disconnect con1
---source include/wait_until_disconnected.inc
---disconnect con2
---source include/wait_until_disconnected.inc
---disconnect con3
---source include/wait_until_disconnected.inc
---disconnect con4
---source include/wait_until_disconnected.inc
---disconnect con5
---source include/wait_until_disconnected.inc
---connection default
---disable_connect_log
-DROP SCHEMA test_i_s;
-SET @@lock_wait_timeout= @lock_wait_timeout_saved;
-
 --echo #
 --echo # Additional coverage for WL#7743 "New data dictionary: changes
 --echo # to DDL-related parts of SE API".

sql/dd/dd_table.cc

@@ -19,7 +19,6 @@
 #include <algorithm>
 #include <memory>                             // unique_ptr
 
-#include "current_thd.h"
 #include "dd/cache/dictionary_client.h"       // dd::cache::Dictionary_client
 #include "dd/dd.h"                            // dd::get_dictionary
 #include "dd/dd_schema.h"                     // dd::Schema_MDL_locker
@@ -2660,9 +2659,6 @@ bool rename_table(THD *thd, dd::Table *to_table_def,
   // Mark the hidden flag.
   to_table_def->set_hidden(mark_as_hidden);
 
-  DBUG_EXECUTE_IF("alter_table_after_rename_1",
-                  DEBUG_SYNC(thd, "before_rename_in_dd"););
-
   // Do the update. Errors will be reported by the dictionary subsystem.
   if (thd->dd_client()->update(to_table_def))
   {
@@ -2675,10 +2671,6 @@ bool rename_table(THD *thd, dd::Table *to_table_def,
     return true;
   }
 
-  DBUG_EXECUTE_IF("alter_table_after_rename_1",
-                   DBUG_SET("-d,alter_table_after_rename_1");
-                   DEBUG_SYNC(thd, "after_rename_in_dd"););
-
   if (commit_dd_changes)
   {
     if (trans_commit_stmt(thd) || trans_commit(thd))
@@ -2714,8 +2706,6 @@ bool abstract_table_type(dd::cache::Dictionary_client *client,
   DBUG_ASSERT(table_type);
   *table_type= table->type();
 
-  DEBUG_SYNC(current_thd, "after_acquire_abstract_table");
-
   DBUG_RETURN(false);
 }
 

sql/sql_show.cc

@@ -4395,8 +4395,6 @@ static int get_all_tables(THD *thd, TABLE_LIST *tables, Item *cond)
       if (res)
         goto err;
 
-      DEBUG_SYNC(thd, "show_after_table_list_prep");
-
       List_iterator_fast<LEX_STRING> it_files(table_names);
       while ((table_name= it_files++))
       {

sql/sql_table.cc

@@ -12722,10 +12722,6 @@ bool mysql_alter_table(THD *thd, const char *new_db, const char *new_name,
     goto err_with_mdl;
   }
 
-  DBUG_EXECUTE_IF("alter_table_after_rename",
-                  DBUG_SET("-d,alter_table_after_rename");
-                  DBUG_SET("+d,alter_table_after_rename_1"););
-
   // Rename the new table to the correct name.
   if (mysql_rename_table(thd, new_db_type, alter_ctx.new_db, alter_ctx.tmp_name,
                          alter_ctx.new_db, alter_ctx.new_alias,