summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@linux.ibm.com>2020-04-29 18:23:17 +1000
committerDaniel Black <daniel@mariadb.org>2020-07-28 10:36:47 +1000
commitba191f7e43962b8f36699c087786cb7ae9ff1fe5 (patch)
treec726a243e5597d04c4fae6c3ba14e97a9b75cc07
parentfecc6caa27971bd9c049671ddedef8c334e71062 (diff)
downloadmariadb-git-ba191f7e43962b8f36699c087786cb7ae9ff1fe5.tar.gz
mtr: mysqld--help-aria test on OSX fail
Previous test failure: --- /Users/travis/build/grooverdan/mariadb-server/mysql-test/main/mysqld--help-aria.result 2020-04-29 03:44:40.000000000 +0000 +++ /Users/travis/build/grooverdan/mariadb-server/mysql-test/main/mysqld--help-aria.reject 2020-04-29 04:19:13.000000000 +0000 @@ -1,3 +1,4 @@ +[Warning] Setting lower_case_table_names=2 because file system for /Users/travis/build/grooverdan/mariadb-server/mysql-test/var/4/mariadbd.1/data/ is case insensitive [ERROR] mariadbd: Can't lock aria aria_log_control for exclusive use, error: #. Will retry for 0 seconds [ERROR] Plugin 'Aria' init function returned error. [ERROR] Plugin 'Aria' registration as a STORAGE ENGINE failed. @@ -9,4 +10,5 @@ # # Check with existing directory # +[Warning] Setting lower_case_table_names=2 because file system for /Users/travis/build/grooverdan/mariadb-server/mysql-test/var/tmp/4/help/ is case insensitive [Warning] Could not open mysql.plugin table: "Table 'mysql.plugin' doesn't exist". Some options may be missing from the help text
-rw-r--r--mysql-test/main/mysqld--help-aria.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help-aria.test b/mysql-test/main/mysqld--help-aria.test
index 4082951b10a..253a46492f0 100644
--- a/mysql-test/main/mysqld--help-aria.test
+++ b/mysql-test/main/mysqld--help-aria.test
@@ -7,7 +7,7 @@
--source include/not_windows.inc
---let $args=--table-cache=5 --max-connections=10 --log-warnings=1 --silent-startup --help --verbose
+--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: #/