Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ

1 files changed, 0 insertions, 52 deletions

diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index f1e78441852..13f368b6dbe 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -1489,16 +1489,13 @@ drop tables if exists t1, t2, t3;
 create table t1 (i int);
 create table t2 (j int primary key auto_increment);
 connect (con3726_1,localhost,root,,test);
---echo # Switching to connection 'con3726_1'
 connection con3726_1;
 lock table t2 read;
 connect (con3726_2,localhost,root,,test);
---echo # Switching to connection 'con3726_2'
 connection con3726_2;
 --echo # RENAME below will be blocked by 'lock table t2 read' above but
 --echo # will add two pending requests for exclusive metadata locks.
 --send rename table t2 to t3
---echo # Switching to connection 'default'
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -1510,13 +1507,10 @@ select table_name, column_name, data_type from information_schema.columns
   where table_schema = 'test' and table_name in ('t1', 't2');
 select table_name, auto_increment from information_schema.tables
   where table_schema = 'test' and table_name in ('t1', 't2');
---echo # Switching to connection 'con3726_1'
 connection con3726_1;
 unlock tables;
---echo # Switching to connection 'con3726_2'
 connection con3726_2;
 --reap
---echo # Switching to connection 'default'
 connection default;
 disconnect con3726_1;
 disconnect con3726_2;
@@ -1604,10 +1598,8 @@ create view v1 as select t1.a, t1.b from t1;
 alter table t1 change b c int;
 lock table t1 read;
 connect(con1, localhost, root,,);
---echo # --> connection con1
 connection con1;
 send flush tables;
---echo # --> connection default
 connection default;
 let $wait_condition=
   select count(*) = 1 from information_schema.processlist
@@ -1623,13 +1615,11 @@ unlock tables;
 --echo # Cleanup.
 --echo #
 
---echo # --> connection con1
 connection con1;
 --echo # Reaping 'flush tables'
 reap;
 disconnect con1;
 --source include/wait_until_disconnected.inc
---echo # --> connection default
 connection default;
 drop table t1;
 drop view v1;
@@ -1663,17 +1653,11 @@ create table t2 (k int);
 --echo # blocked.
 lock tables t2 read;
 
---echo #
---echo # Switching to connection 'con12828477_1'. 
---echo #
 connect (con12828477_1, localhost, root,,mysqltest);
 --echo # The below RENAME should wait on 't2' while
 --echo # keeping X lock on 't1'.
 --send rename table t1 to t3, t2 to t1, t3 to t2
 
---echo #
---echo # Switching to connection 'con12828477_2'. 
---echo #
 connect (con12828477_2, localhost, root,,mysqltest);
 --echo # Wait while the above RENAME is blocked.
 let $wait_condition=
@@ -1686,9 +1670,6 @@ let $wait_condition=
 --echo # blocked on 't1' because of RENAME.
 --send select table_name, auto_increment from information_schema.tables where table_schema='mysqltest'
 
---echo #
---echo # Switching to connection 'con12828477_3'. 
---echo #
 connect (con12828477_3, localhost, root,,mysqltest);
 --echo # Wait while the above SELECT is blocked.
 let $wait_condition=
@@ -1701,31 +1682,19 @@ let $wait_condition=
 --echo # Check that it holds no lock on 't0' so it can be renamed.
 rename table t0 to t4;
 
---echo #
---echo # Switching to connection 'default'.
---echo #
 connection default;
 --echo #
 --echo # Unblock the first RENAME.
 unlock tables;
 
---echo #
---echo # Switching to connection 'con12828477_1'. 
---echo #
 connection con12828477_1;
 --echo # Reap the first RENAME
 --reap
 
---echo #
---echo # Switching to connection 'con12828477_2'. 
---echo #
 connection con12828477_2;
 --echo # Reap SELECT to I_S.
 --reap
 
---echo #
---echo # Switching to connection 'default'.
---echo #
 connection default;
 
 --echo #
@@ -1739,17 +1708,11 @@ rename table t4 to t0;
 --echo # blocked.
 lock tables t2 read;
 
---echo #
---echo # Switching to connection 'con12828477_1'. 
---echo #
 connection con12828477_1;
 --echo # The below RENAME should wait on 't2' while
 --echo # keeping X lock on 't1'.
 --send rename table t1 to t3, t2 to t1, t3 to t2
 
---echo #
---echo # Switching to connection 'con12828477_2'. 
---echo #
 connection con12828477_2;
 --echo # Wait while the above RENAME is blocked.
 let $wait_condition=
@@ -1762,9 +1725,6 @@ let $wait_condition=
 --echo # blocked on 't1' because of RENAME.
 --send select event_object_table, trigger_name from information_schema.triggers where event_object_schema='mysqltest'
 
---echo #
---echo # Switching to connection 'con12828477_3'. 
---echo #
 connection con12828477_3;
 --echo # Wait while the above SELECT is blocked.
 let $wait_condition=
@@ -1777,31 +1737,19 @@ let $wait_condition=
 --echo # Check that it holds no lock on 't0' so it can be renamed.
 rename table t0 to t4;
 
---echo #
---echo # Switching to connection 'default'.
---echo #
 connection default;
 --echo #
 --echo # Unblock the first RENAME.
 unlock tables;
 
---echo #
---echo # Switching to connection 'con12828477_1'. 
---echo #
 connection con12828477_1;
 --echo # Reap the first RENAME
 --reap
 
---echo #
---echo # Switching to connection 'con12828477_2'. 
---echo #
 connection con12828477_2;
 --echo # Reap SELECT to I_S.
 --reap
 
---echo #
---echo # Switching to connection 'default'.
---echo #
 connection default;
 disconnect con12828477_1;
 disconnect con12828477_2;