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/merge.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/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 5bfe22697dd..faa420fd275 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -655,7 +655,7 @@ insert into t1 values (1); flush tables; # Open t2 and (implicitly) t1. select * from t2; -# Truncate t1, wich was not recognized as open without the bugfix. +# Truncate t1, which was not recognized as open without the bugfix. # After fix for Bug#8306 and before fix for Bug#26379, # it should fail with a table-in-use error message, otherwise succeed. truncate table t1; @@ -2585,7 +2585,6 @@ DROP TABLE t1, t2, t3, t4, m1, m2; --disable_warnings DROP TABLE IF EXISTS t1, t2, t3; --enable_warnings ---echo # Connection con1. connect (con1,localhost,root,,); CREATE TABLE t1 (c1 int); CREATE TABLE t2 (c1 int); @@ -2594,12 +2593,10 @@ START TRANSACTION; --error ER_ILLEGAL_HA HANDLER t3 OPEN; DROP TABLE t1, t2, t3; ---echo # Connection default. connection default; ---echo # Disconnecting con1, all mdl_tickets must have been released. +--echo # all mdl_tickets must have been released. disconnect con1; --echo # The bug-specific case. ---echo # Connection con1. connect (con1,localhost,root,,); CREATE TABLE t1 (c1 int); CREATE TABLE t2 (c1 int); @@ -2609,9 +2606,8 @@ START TRANSACTION; --error ER_WRONG_MRG_TABLE HANDLER t3 OPEN; DROP TABLE t1, t3; ---echo # Connection default. connection default; ---echo # Disconnecting con1, all mdl_tickets must have been released. +--echo # all mdl_tickets must have been released. disconnect con1; --echo # |