diff options
| author | Lena Startseva <lena.startseva@mariadb.com> | 2022-09-23 19:47:13 +0700 |
|---|---|---|
| committer | Lena Startseva <lena.startseva@mariadb.com> | 2022-09-23 19:47:13 +0700 |
| commit | 78dcf71e88c86772f89f4ae788079c3619a4d38c (patch) | |
| tree | 8557a5777219e4e06c15a53ab5633f7ca52b3123 /mysql-test/include/index_merge1.inc | |
| parent | 0c0a56902898038726342ae11decf4bf5421d339 (diff) | |
| parent | 72ba96a48eb3e99a967e0489cc79f378e865e3fd (diff) | |
| download | mariadb-git-78dcf71e88c86772f89f4ae788079c3619a4d38c.tar.gz | |
Merge branch 'bb-10.3-all-builders' into bb-10.4-all-builders
Diffstat (limited to 'mysql-test/include/index_merge1.inc')
| -rw-r--r-- | mysql-test/include/index_merge1.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/include/index_merge1.inc b/mysql-test/include/index_merge1.inc index fdd87f85ef5..e54fbe2834f 100644 --- a/mysql-test/include/index_merge1.inc +++ b/mysql-test/include/index_merge1.inc @@ -300,6 +300,10 @@ select * from t0 where key1 < 3 or key2 < 4; select count(*) from t0; # Test for BUG#4177 + +# enable view-protocol after fix MDEV-27871 +--disable_view_protocol + drop table t4; create table t4 (a int); insert into t4 values (1),(4),(3); @@ -349,6 +353,8 @@ set join_buffer_size= @save_join_buffer_size; drop table t0, t1, t2, t3, t4; +--enable_view_protocol + # BUG#16166 CREATE TABLE t1 ( cola char(3) not null, colb char(3) not null, filler char(200), @@ -412,6 +418,7 @@ drop table t1, t2, t3; # # BUG#20256 - LOCK WRITE - MyISAM # +--disable_service_connection CREATE TABLE t1(a INT); INSERT INTO t1 VALUES(1); CREATE TABLE t2(a INT, b INT, dummy CHAR(16) DEFAULT '', KEY(a), KEY(b)); @@ -440,6 +447,7 @@ INSERT INTO t2(a,b) VALUES(1,2); SELECT t2.a FROM t1,t2 WHERE t2.b=2 AND t2.a=1; UNLOCK TABLES; DROP TABLE t1, t2; +--enable_service_connection # # BUG#29740: HA_KEY_SCAN_NOT_ROR wasn't set for HEAP engine |