summaryrefslogtreecommitdiff
path: root/mysql-test/t/bootstrap.test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-04-23 18:49:19 +0200
committerSergei Golubchik <serg@mariadb.org>2016-04-24 18:15:20 +0200
commit7b58fd5ef0c1ecdc7c6d6d3347110620e67313c2 (patch)
treecc7adc5f126e8002efffe8e06741bc6aee55441a /mysql-test/t/bootstrap.test
parent0ee919b86e214a79541f1e9a16b63ae8784b4790 (diff)
downloadmariadb-git-7b58fd5ef0c1ecdc7c6d6d3347110620e67313c2.tar.gz
tests -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
This fixes: MDEV-7693 MariaDB - mysql-test - SUITE:funcs_1 - funcs_1.is_tables_mysql is failing on TABLE_COLLATION /DATABASE_COLLATION MDEV-8487 mysql-test - main.information_schema 'xtradb' fails MDEV-8486 mysql-test - main.bootstrap fails
Diffstat (limited to 'mysql-test/t/bootstrap.test')
-rw-r--r--mysql-test/t/bootstrap.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/bootstrap.test b/mysql-test/t/bootstrap.test
index 97376eb7412..e2d21c0d990 100644
--- a/mysql-test/t/bootstrap.test
+++ b/mysql-test/t/bootstrap.test
@@ -79,7 +79,7 @@ EOF
#
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql
use test;
-create table t1(a int) engine=example;
+create table t1(a int) engine=example charset=latin1;
EOF
--exec $MYSQLD_BOOTSTRAP_CMD --plugin-dir=$PLUGIN_DIR < $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
--remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql