database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

main.bootstrap test cleanup

Browse Source
This commit is contained in:
Sergei Golubchik
2023-03-09 11:32:18 +01:00
parent e62947f38b
commit fb7d588153
2 changed files with 89 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mysql-test/main/bootstrap.result
View File

@ -1,13 +1,26 @@
drop table if exists t1; #
# test mysqld in bootstrap mode
#
#
# Check that --bootstrap reads from stdin
#
drop table t1; drop table t1;
#
# Check that --bootstrap of file with SQL error returns error
#
drop table t1; drop table t1;
ERROR 42S02: Unknown table 'test.t1' ERROR 42S02: Unknown table 'test.t1'
#
# Bootstrap with a large thd->net.max_packet
#
set @my_max_allowed_packet= @@max_allowed_packet; set @my_max_allowed_packet= @@max_allowed_packet;
set @@global.max_allowed_packet= greatest(1073741824, @@max_allowed_packet); set @@global.max_allowed_packet= greatest(1073741824, @@max_allowed_packet);
set @max_allowed_packed=@@global.max_allowed_packet; set @max_allowed_packed=@@global.max_allowed_packet;
set global max_allowed_packet=@my_max_allowed_packet; set global max_allowed_packet=@my_max_allowed_packet;
drop table t1; drop table t1;
End of 5.1 tests #
# End of 5.1 tests
#
# #
# Bug #11766306: 59393: HAVE_INNODB=YES WHEN MYSQLD # Bug #11766306: 59393: HAVE_INNODB=YES WHEN MYSQLD
# STARTED WITH --SKIP-INNODB # STARTED WITH --SKIP-INNODB
@ -15,7 +28,21 @@ End of 5.1 tests
SELECT 'bug' as '' FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb' SELECT 'bug' as '' FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb'
and SUPPORT='YES'; and SUPPORT='YES';
End of 5.5 tests #
# MDEV-13063 Server crashes in intern_plugin_lock or assertion `plugin_ptr->ref_count == 1' fails in plugin_init
#
#
# MDEV-19349 mysql_install_db: segfault at tmp_file_prefix check
#
#
# End of 5.5 tests
#
#
# Check that --bootstrap can install and uninstall plugins
#
#
# Check that installed plugins are *not* automatically loaded in --bootstrap
#
flush tables; flush tables;
show create table t1; show create table t1;
Table Create Table Table Create Table
@ -27,3 +54,12 @@ select * from mysql.plugin;
name dl name dl
EXAMPLE ha_example.so EXAMPLE ha_example.so
truncate table mysql.plugin; truncate table mysql.plugin;
#
# MDEV-9969 mysql_install_db error processing ignore_db_dirs.
#
#
# MDEV-13397 MariaDB upgrade fail when using default_time_zone
#
#
# End of 10.3 tests
#

102
mysql-test/main/bootstrap.test
View File

@ -1,16 +1,20 @@
# --echo #
# test mysqld in bootstrap mode --echo # test mysqld in bootstrap mode
# --echo #
--disable_warnings --source include/not_windows_embedded.inc
drop table if exists t1; --source include/have_example_plugin.inc
--enable_warnings
--let test_bootstrap=$MYSQLTEST_VARDIR/tmp/test_bootstrap.sql
--write_file $test_bootstrap
use test;
EOF
# Add the datadir to the bootstrap command # Add the datadir to the bootstrap command
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --tmpdir=$MYSQL_TMP_DIR --default-storage-engine=MyISAM --loose-skip-innodb --plugin-maturity=unknown; let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --tmpdir=$MYSQL_TMP_DIR --default-storage-engine=MyISAM --loose-skip-innodb --plugin-maturity=unknown;
# --echo #
# Check that --bootstrap reads from stdin --echo # Check that --bootstrap reads from stdin
# --echo #
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql --write_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql
use test; use test;
CREATE TABLE t1(a int); CREATE TABLE t1(a int);
@ -18,9 +22,9 @@ EOF
--exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1 --exec $MYSQLD_BOOTSTRAP_CMD < $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
drop table t1; drop table t1;
remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql; remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_test.sql;
# --echo #
# Check that --bootstrap of file with SQL error returns error --echo # Check that --bootstrap of file with SQL error returns error
# --echo #
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_error.sql --write_file $MYSQLTEST_VARDIR/tmp/bootstrap_error.sql
use test; use test;
CREATE TABLE t1; CREATE TABLE t1;
@ -32,9 +36,9 @@ EOF
drop table t1; drop table t1;
remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_error.sql; remove_file $MYSQLTEST_VARDIR/tmp/bootstrap_error.sql;
# --echo #
# Bootstrap with a large thd->net.max_packet --echo # Bootstrap with a large thd->net.max_packet
# --echo #
set @my_max_allowed_packet= @@max_allowed_packet; set @my_max_allowed_packet= @@max_allowed_packet;
set @@global.max_allowed_packet= greatest(1073741824, @@max_allowed_packet); set @@global.max_allowed_packet= greatest(1073741824, @@max_allowed_packet);
set @max_allowed_packed=@@global.max_allowed_packet; set @max_allowed_packed=@@global.max_allowed_packet;
@ -49,7 +53,9 @@ remove_file $MYSQLTEST_VARDIR/tmp/long_query.sql;
set global max_allowed_packet=@my_max_allowed_packet; set global max_allowed_packet=@my_max_allowed_packet;
drop table t1; drop table t1;
--echo End of 5.1 tests --echo #
--echo # End of 5.1 tests
--echo #
--echo # --echo #
--echo # Bug #11766306: 59393: HAVE_INNODB=YES WHEN MYSQLD --echo # Bug #11766306: 59393: HAVE_INNODB=YES WHEN MYSQLD
@ -60,28 +66,24 @@ drop table t1;
SELECT 'bug' as '' FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb' SELECT 'bug' as '' FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb'
and SUPPORT='YES'; and SUPPORT='YES';
# --echo #
# MDEV-13063 Server crashes in intern_plugin_lock or assertion `plugin_ptr->ref_count == 1' fails in plugin_init --echo # MDEV-13063 Server crashes in intern_plugin_lock or assertion `plugin_ptr->ref_count == 1' fails in plugin_init
# --echo #
--error 1 --error 1
--exec $MYSQLD_BOOTSTRAP_CMD --myisam_recover_options=NONE --exec $MYSQLD_BOOTSTRAP_CMD --myisam_recover_options=NONE
# --echo #
# MDEV-19349 mysql_install_db: segfault at tmp_file_prefix check --echo # MDEV-19349 mysql_install_db: segfault at tmp_file_prefix check
# --echo #
--write_file $MYSQLTEST_VARDIR/tmp/1 --exec $MYSQLD_BOOTSTRAP_CMD < $test_bootstrap >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&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 --echo #
--echo # End of 5.5 tests
--echo #
--source include/not_windows_embedded.inc --echo #
--source include/have_example_plugin.inc --echo # Check that --bootstrap can install and uninstall plugins
# --echo #
# Check that --bootstrap can install and uninstall plugins
#
let $PLUGIN_DIR=`select @@plugin_dir`; let $PLUGIN_DIR=`select @@plugin_dir`;
--write_file $MYSQLTEST_VARDIR/tmp/install_plugin.sql --write_file $MYSQLTEST_VARDIR/tmp/install_plugin.sql
install soname 'ha_example'; install soname 'ha_example';
@ -90,9 +92,9 @@ EOF
--exec $MYSQLD_BOOTSTRAP_CMD --plugin-dir=$PLUGIN_DIR < $MYSQLTEST_VARDIR/tmp/install_plugin.sql >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1 --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 --remove_file $MYSQLTEST_VARDIR/tmp/install_plugin.sql
# --echo #
# Check that installed plugins are *not* automatically loaded in --bootstrap --echo # Check that installed plugins are *not* automatically loaded in --bootstrap
# --echo #
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql --write_file $MYSQLTEST_VARDIR/tmp/bootstrap_plugins.sql
SET SQL_MODE=""; SET SQL_MODE="";
use test; use test;
@ -107,21 +109,17 @@ drop table t1;
select * from mysql.plugin; select * from mysql.plugin;
truncate table mysql.plugin; truncate table mysql.plugin;
--echo #
--echo # MDEV-9969 mysql_install_db error processing ignore_db_dirs.
--echo #
--exec $MYSQLD_BOOTSTRAP_CMD --ignore-db-dirs='some_dir' --ignore-db-dirs='some_dir' < $test_bootstrap >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
# --echo #
# MDEV-9969 mysql_install_db error processing ignore_db_dirs. --echo # MDEV-13397 MariaDB upgrade fail when using default_time_zone
# --echo #
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql --exec $MYSQLD_BOOTSTRAP_CMD --default-time-zone=Europe/Moscow < $test_bootstrap >> $MYSQLTEST_VARDIR/tmp/bootstrap.log 2>&1
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
# --echo #
# MDEV-13397 MariaDB upgrade fail when using default_time_zone --echo # End of 10.3 tests
# --echo #
--write_file $MYSQLTEST_VARDIR/tmp/bootstrap_9969.sql --remove_file $test_bootstrap
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