From a175314c3e5827eb193872241446f2f8f5c9d33c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 20:07:14 +0200 Subject: Adding upstream version 1:10.5.12. Signed-off-by: Daniel Baumann --- mysql-test/main/mysqld--help-aria.test | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 mysql-test/main/mysqld--help-aria.test (limited to 'mysql-test/main/mysqld--help-aria.test') diff --git a/mysql-test/main/mysqld--help-aria.test b/mysql-test/main/mysqld--help-aria.test new file mode 100644 index 00000000..253a4649 --- /dev/null +++ b/mysql-test/main/mysqld--help-aria.test @@ -0,0 +1,39 @@ +# +# Check errors from mysqld--help when providing different datadir +# + +# We can't run this test on windows as windows doesn't provide file locking +# which the first exec requires. + +--source include/not_windows.inc + +--let $args=--table-cache=5 --max-connections=10 --log-warnings=1 --silent-startup --lower-case-table-names=1 --help --verbose + +--exec $MYSQLD_CMD $args > $MYSQL_TMP_DIR/mysqld--help2.txt 2> $MYSQL_TMP_DIR/mysqld--help2.err +--replace_regex /mysqld/mariadbd/ /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* // /control file '.*aria_log_control'/aria_log_control/ /error: \d+/error: #/ +--cat_file $MYSQL_TMP_DIR/mysqld--help2.err + +--echo # +--echo # Check that we don't write any data to wrong or not existing datadir +--echo # + +--exec $MYSQLD_CMD $args --datadir=$MYSQL_TMP_DIR/help > $MYSQL_TMP_DIR/mysqld--help2.txt 2> $MYSQL_TMP_DIR/mysqld--help2.err +--replace_regex /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* // +--cat_file $MYSQL_TMP_DIR/mysqld--help2.err + +--echo # +--echo # Check with existing directory +--echo # + +--mkdir $MYSQL_TMP_DIR/help +--exec $MYSQLD_CMD $args --datadir=$MYSQL_TMP_DIR/help > $MYSQL_TMP_DIR/mysqld--help2.txt 2> $MYSQL_TMP_DIR/mysqld--help2.err +--replace_regex /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* // +--cat_file $MYSQL_TMP_DIR/mysqld--help2.err +--list_files $MYSQL_TMP_DIR/help + +# +# Cleanup +# +--rmdir $MYSQL_TMP_DIR/help +--remove_file $MYSQL_TMP_DIR/mysqld--help2.txt +--remove_file $MYSQL_TMP_DIR/mysqld--help2.err -- cgit v1.2.3