diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 09:26:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 09:26:38 +0200 |
| commit | 3f5726768f17342fd6dfec1be1e4d71814bc8564 (patch) | |
| tree | cc85210cf84b11f0543d9a20bcb78f40cb32c140 /mysql-test/main/mysqld--help-aria.test | |
| parent | c410f7aaea400eb98f13552725b685a2513aafcb (diff) | |
| parent | 4c3ad24413f234599eda27f4958dd3ff21df3203 (diff) | |
| download | mariadb-git-3f5726768f17342fd6dfec1be1e4d71814bc8564.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/mysqld--help-aria.test')
| -rw-r--r-- | mysql-test/main/mysqld--help-aria.test | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mysql-test/main/mysqld--help-aria.test b/mysql-test/main/mysqld--help-aria.test index 253a46492f0..55131e9e4eb 100644 --- a/mysql-test/main/mysqld--help-aria.test +++ b/mysql-test/main/mysqld--help-aria.test @@ -2,15 +2,10 @@ # 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: #/ +--replace_regex /mysqld/mariadbd/ /\d\d\d\d-\d*-\d* *\d*:\d*:\d* \d* // --cat_file $MYSQL_TMP_DIR/mysqld--help2.err --echo # |