diff options
| author | Monty <monty@mariadb.org> | 2017-11-09 23:21:41 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-11-09 23:21:41 +0200 |
| commit | 0bb0d52221af99c46d17486382806caa6dd7338e (patch) | |
| tree | 92b2ddfceaf8df5be6d47774b25fd3006ac5bb35 /mysql-test/t/show_check.test | |
| parent | 7dbff2c513aeec3b3f3d0fa4952ae97deba22282 (diff) | |
| parent | d40c23570ff1a9ba5aa317b85a32a4b27780b8ab (diff) | |
| download | mariadb-git-0bb0d52221af99c46d17486382806caa6dd7338e.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/cte_recursive.result
mysql-test/r/derived_cond_pushdown.result
mysql-test/t/cte_recursive.test
mysql-test/t/derived_cond_pushdown.test
sql/datadict.cc
sql/handler.cc
Diffstat (limited to 'mysql-test/t/show_check.test')
| -rw-r--r-- | mysql-test/t/show_check.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 13ca9a528c6..4024d2e522c 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -423,7 +423,7 @@ create table t1 ( SHOW CREATE TABLE t1; DROP TABLE t1; -# Test for Bug#93 4.1 protocl crash on corupted frm and SHOW TABLE STATUS +# Test for Bug#93 4.1 protocol crash on corrupted frm and SHOW TABLE STATUS flush tables; @@ -437,7 +437,7 @@ show create table t1; --disable_warnings drop table if exists t1; --enable_warnings ---error 1,0 +--error 0,1 --remove_file $MYSQLD_DATADIR/test/t1.frm # |