diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2020-01-17 00:46:40 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2020-01-17 00:46:40 +0300 |
| commit | e709eb9bf712006d070767629518f827cd2f6bed (patch) | |
| tree | 103290899cbe2a67f78277e0e33486e51ef01717 /mysql-test/main/range_innodb.test | |
| parent | d531b4ee3a9bcd89a2fa6b49a2207eaf966f53e3 (diff) | |
| parent | b04429434ad1ee7f49d263762a560f4ff31dd111 (diff) | |
| download | mariadb-git-e709eb9bf712006d070767629518f827cd2f6bed.tar.gz | |
Merge branch '10.2' into 10.3
# Conflicts:
# mysql-test/suite/galera/r/MW-388.result
# mysql-test/suite/galera/t/MW-388.test
# mysql-test/suite/innodb/r/truncate_inject.result
# mysql-test/suite/innodb/t/truncate_inject.test
# mysql-test/suite/rpl/r/rpl_stop_slave.result
# mysql-test/suite/rpl/t/rpl_stop_slave.test
# sql/sp_head.cc
# sql/sp_head.h
# sql/sql_lex.cc
# sql/sql_yacc.yy
# storage/xtradb/buf/buf0dblwr.cc
Diffstat (limited to 'mysql-test/main/range_innodb.test')
| -rw-r--r-- | mysql-test/main/range_innodb.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/main/range_innodb.test b/mysql-test/main/range_innodb.test index a17ef3f1146..928ed74f784 100644 --- a/mysql-test/main/range_innodb.test +++ b/mysql-test/main/range_innodb.test @@ -80,10 +80,11 @@ create table t1 ( insert into t1 select A.a+10*B.a, A.a+10*B.a, A.a+10*B.a+100*C.a from t0 A, t0 B, t0 C, t0 D where D.a<5; +SET @saved_dbug = @@GLOBAL.debug_dbug; set @@global.debug_dbug="+d,ha_index_init_fail"; explain select * from t1 where a=10 and b=10; --error ER_TABLE_DEF_CHANGED select * from t1 where a=10 and b=10; DROP TABLE t0,t1; -set @@global.debug_dbug="-d"; +SET @@GLOBAL.debug_dbug = @saved_dbug; set @@optimizer_switch= @optimizer_switch_save; |