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/mysqldump-max.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/mysqldump-max.test')
| -rw-r--r-- | mysql-test/t/mysqldump-max.test | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mysql-test/t/mysqldump-max.test b/mysql-test/t/mysqldump-max.test index 3f73f046959..f5f4dbcd088 100644 --- a/mysql-test/t/mysqldump-max.test +++ b/mysql-test/t/mysqldump-max.test @@ -1133,7 +1133,6 @@ connect(c2,127.0.0.1,root,,test,$MASTER_MYPORT,); connect(c3,127.0.0.1,root,,test,$MASTER_MYPORT,); connection default; ---echo # Connection default SET binlog_format= mixed; RESET MASTER; CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB; @@ -1143,23 +1142,19 @@ INSERT INTO t2 VALUES (1,0), (2,0); SELECT GET_LOCK("block_queries_1", 120); connection c3; ---echo # Connection c3 SELECT GET_LOCK("block_queries_2", 120); # Start two queries that will be running on the tables during mysqldump connection c1; ---echo # Connection c1 SET @c= 0; send SELECT IF(@c<1, @c:=@c+1, GET_LOCK("block_queries_1", 120)) FROM t1 ORDER BY a; connection c2; ---echo # Connection c2 SET binlog_format="row"; SET @d= 10; send UPDATE t2 SET b=IF(@d<=10, @d:=@d+1, GET_LOCK("block_queries_2", 120)) ORDER BY a; connection default; ---echo # Connection default --echo # Make sure other queries are running (and waiting). let $wait_condition= SELECT COUNT(*) FROM information_schema.processlist @@ -1175,19 +1170,15 @@ let $wait_condition= SELECT RELEASE_LOCK("block_queries_1"); connection c3; ---echo # Connection c3 SELECT RELEASE_LOCK("block_queries_2"); connection c1; ---echo # Connection c1 reap; connection c2; ---echo # Connection c2 reap; connection default; ---echo # Connection default SELECT * FROM t2 ORDER BY a; DROP TABLE t1; DROP TABLE t2; |