summaryrefslogtreecommitdiff
path: root/mysql-test/suite/vcol/t/vcol_misc.test
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2018-06-19 14:04:53 +0400
committerAlexander Barkov <bar@mariadb.com>2018-06-19 14:04:53 +0400
commitf5b128dfad1f46bf73916bc9c803a7152fdd6809 (patch)
tree447ef763592b99402ced91dd6e6203f2b3c5368f /mysql-test/suite/vcol/t/vcol_misc.test
parentf7b1b2bc5d6e1f923aca0ee8c5232cf095075c7b (diff)
parentc450f7d8d5bfdc0d3ae0fbc634eb22d4b75e7322 (diff)
downloadmariadb-git-f5b128dfad1f46bf73916bc9c803a7152fdd6809.tar.gz
Merge remote-tracking branch 'origin/10.0' into 10.1
Diffstat (limited to 'mysql-test/suite/vcol/t/vcol_misc.test')
-rw-r--r--mysql-test/suite/vcol/t/vcol_misc.test16
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test
index 1eed47269c2..222c3f562be 100644
--- a/mysql-test/suite/vcol/t/vcol_misc.test
+++ b/mysql-test/suite/vcol/t/vcol_misc.test
@@ -1,5 +1,7 @@
--source include/have_ucs2.inc
+let $MYSQLD_DATADIR= `select @@datadir`;
+
--disable_warnings
drop table if exists t1,t2;
--enable_warnings
@@ -318,6 +320,20 @@ SELECT * FROM t1;
DROP TABLE t1;
SET sql_mode=DEFAULT;
+
+--echo #
+--echo # MDEV-15834 The code in TABLE_SHARE::init_from_binary_frm_image() is not safe
+--echo #
+
+--copy_file std_data/frm/t1.frm $MYSQLD_DATADIR/test/t1.frm
+SHOW TABLES;
+--error ER_NOT_FORM_FILE
+SHOW CREATE TABLE t1;
+--error ER_NOT_FORM_FILE
+ALTER TABLE t1;
+--remove_file $MYSQLD_DATADIR/test/t1.frm
+
+
--echo #
--echo # End of 5.5 tests
--echo #