[Commits] 1380efa28e5: Merge branch '5.5' into 10.1

Oleksandr Byelkin sanja at mariadb.com
Thu May 2 10:23:51 EEST 2019


revision-id: 1380efa28e59bee9a76fdd8f84397fdecd42ac85 (mariadb-10.1.38-158-g1380efa28e5)
parent(s): ca94ce2a5817cec6d402b6c92653330825e0a2bf aba911542641c93553bad0307021983998042d69
author: Oleksandr Byelkin
committer: Oleksandr Byelkin
timestamp: 2019-05-02 09:23:39 +0200
message:

Merge branch '5.5' into 10.1


 mysql-test/t/bootstrap.test | 9 +++++++++
 sql/sql_base.cc             | 3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --cc mysql-test/t/bootstrap.test
index 8508c6c9dc6,5494a2d4154..879d42be2d6
--- a/mysql-test/t/bootstrap.test
+++ b/mysql-test/t/bootstrap.test
@@@ -65,53 -66,13 +65,62 @@@ SELECT 'bug' as '' FROM INFORMATION_SCH
  --error 1
  --exec $MYSQLD_BOOTSTRAP_CMD --myisam_recover_options=NONE
  
+ #
+ # MDEV-19349 mysql_install_db: segfault at tmp_file_prefix check
+ #
+ --write_file $MYSQLTEST_VARDIR/tmp/1
+ use test;
+ EOF
+ --exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/1 >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
+ --remove_file $MYSQLTEST_VARDIR/tmp/1
+ 
  --echo End of 5.5 tests
 +
 +--source include/not_windows_embedded.inc
 +--source include/have_example_plugin.inc
 +#
 +# Check that --bootstrap can install and uninstall plugins
 +#
 +let $PLUGIN_DIR=`select @@plugin_dir`;
 +--write_file $MYSQLTEST_VARDIR/tmp/install_plugin.sql
 +install soname 'ha_example';
 +uninstall plugin unusable;
 +EOF
 +--exec $MYSQLD_BOOTSTRAP_CMD --plugin-dir=$PLUGIN_DIR  < $MYSQLTEST_VARDIR/tmp/install_plugin.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
 +--remove_file $MYSQLTEST_VARDIR/tmp/install_plugin.sql
 +
 +#
 +# Check that installed plugins are *not* automatically loaded in --bootstrap
 +#
 +--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql
 +SET SQL_MODE="";
 +use test;
 +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
 +flush tables;
 +show create table t1;
 +drop table t1;
 +--replace_result .dll .so
 +select * from mysql.plugin;
 +truncate table mysql.plugin;
 +
 +
 +#
 +# MDEV-9969 mysql_install_db error processing ignore_db_dirs.
 +#
 +--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql
 +use test;
 +EOF
 +--exec $MYSQLD_BOOTSTRAP_CMD --ignore-db-dirs='some_dir' --ignore-db-dirs='some_dir' < $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
 +--remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql
 +
 +#
 +# MDEV-13397 MariaDB upgrade fail when using default_time_zone
 +#
 +--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql
 +use test;
 +EOF
 +--exec $MYSQLD_BOOTSTRAP_CMD --default-time-zone=Europe/Moscow < $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
 +--remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql


More information about the commits mailing list