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/mdev6830.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/mdev6830.test')
| -rw-r--r-- | mysql-test/main/mdev6830.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mdev6830.test b/mysql-test/main/mdev6830.test index 3898d5bbef6..ab5f19f7093 100644 --- a/mysql-test/main/mdev6830.test +++ b/mysql-test/main/mdev6830.test @@ -2,7 +2,7 @@ # MDEV-6830 Server crashes in best_access_path after a sequence of SELECTs invollving a temptable view # --source include/have_debug.inc - +SET @saved_dbug = @@SESSION.debug_dbug; set @@debug_dbug= 'd,opt'; CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=MyISAM; @@ -60,4 +60,4 @@ SELECT * FROM t1, v3, t4 WHERE v3.f1 = t4.f1 AND t4.f2 = 6 AND t1.pk = v3.f5; drop table t1,t2,t3,t4; drop view v2,v3; - +SET debug_dbug= @saved_dbug; |