diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/t/innodb_mysql_lock2.test | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-git-10.2-connector-c-integ.tar.gz | |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysql-test/t/innodb_mysql_lock2.test')
| -rw-r--r-- | mysql-test/t/innodb_mysql_lock2.test | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mysql-test/t/innodb_mysql_lock2.test b/mysql-test/t/innodb_mysql_lock2.test index 640f9652462..f319fe23568 100644 --- a/mysql-test/t/innodb_mysql_lock2.test +++ b/mysql-test/t/innodb_mysql_lock2.test @@ -789,12 +789,10 @@ begin; --echo # Acquire SR metadata lock on t1 and LOCK_S row-locks on its rows. insert into t2 select count(*) from t1; ---echo # Switching to connection 'con1'. connection con1; --echo # Sending: --send alter table t1 add column j int ---echo # Switching to connection 'default'. connection default; --echo # Wait until ALTER is blocked because it tries to upgrade SNW --echo # metadata lock to X lock. @@ -817,12 +815,10 @@ insert into t1 values (6); --echo # Unblock ALTER TABLE. commit; ---echo # Switching to connection 'con1'. connection con1; --echo # Reaping ALTER TABLE. --reap ---echo # Switching to connection 'default'. connection default; --echo # @@ -838,12 +834,10 @@ begin; --echo # Acquire SR metadata lock on t1. select * from t1; ---echo # Switching to connection 'con1'. connection con1; --echo # Sending: --send alter table t1 rebuild partition p0 ---echo # Switching to connection 'default'. connection default; --echo # Wait until ALTER is blocked because of active SR lock. let $wait_condition= @@ -859,12 +853,10 @@ insert into t2 select count(*) from t1; --echo # Unblock ALTER TABLE. commit; ---echo # Switching to connection 'con1'. connection con1; --echo # Reaping ALTER TABLE. --reap ---echo # Switching to connection 'default'. connection default; disconnect con1; --echo # Clean-up. |