diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-08 14:21:22 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-08 14:21:22 -0400 |
| commit | 91acc8b16fdd8409765f32b5453851366552a709 (patch) | |
| tree | 18c04064e9fc127c5e477ec08613aae7baaab2ae /mysql-test/extra | |
| parent | 4c69dc8116950d6bf0b09bfbc31a86d89831a364 (diff) | |
| parent | 0403790722e3941779ccea26e85fcd818e2320b5 (diff) | |
| download | mariadb-git-91acc8b16fdd8409765f32b5453851366552a709.tar.gz | |
Merge tag 'mariadb-10.0.21' into 10.0-galera
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test index 48e922d2e67..74fbe6b482a 100644 --- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test +++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test @@ -228,7 +228,7 @@ rollback; create table t0 (n int); insert t0 select * from t1; set autocommit=1; -insert into t0 select GET_LOCK("lock1",null); +insert into t0 select GET_LOCK("lock1",0); set autocommit=0; create table t2 (n int) engine=innodb; insert into t2 values (3); |