diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-03-31 07:49:45 +1100 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2020-04-05 13:58:58 +0200 |
| commit | 8aa4e719188b8dd337bd8dac3928463432f68838 (patch) | |
| tree | ad511e58c421e137c7f131b15345370214f8d075 | |
| parent | 4ac7693678aa38b0cada87730d5f5305de9f3df3 (diff) | |
| download | mariadb-git-bb-10.5-anel-PR1486.tar.gz | |
MDEV-22010: mtr search for mariadbd firstbb-10.5-anel-PR1486
| -rw-r--r-- | mysql-test/main/mysqld--help-aria.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/mysqld--help-aria.test | 2 | ||||
| -rw-r--r-- | mysql-test/main/shutdown.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/shutdown.test | 2 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/main/mysqld--help-aria.result b/mysql-test/main/mysqld--help-aria.result index 08dc5de68d0..70e7d8930c4 100644 --- a/mysql-test/main/mysqld--help-aria.result +++ b/mysql-test/main/mysqld--help-aria.result @@ -1,4 +1,4 @@ -[ERROR] mysqld: Can't lock aria aria_log_control for exclusive use, error: #. Will retry for 0 seconds +[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. [Warning] Could not open mysql.plugin table: "Unknown storage engine 'Aria'". Some options may be missing from the help text diff --git a/mysql-test/main/mysqld--help-aria.test b/mysql-test/main/mysqld--help-aria.test index 953a2b97e8d..4082951b10a 100644 --- a/mysql-test/main/mysqld--help-aria.test +++ b/mysql-test/main/mysqld--help-aria.test @@ -10,7 +10,7 @@ --let $args=--table-cache=5 --max-connections=10 --log-warnings=1 --silent-startup --help --verbose --exec $MYSQLD_CMD $args > $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* // /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* // /control file '.*aria_log_control'/aria_log_control/ /error: \d+/error: #/ --cat_file $MYSQL_TMP_DIR/mysqld--help2.err --echo # diff --git a/mysql-test/main/shutdown.result b/mysql-test/main/shutdown.result index 7a69f58ffd9..681c184f640 100644 --- a/mysql-test/main/shutdown.result +++ b/mysql-test/main/shutdown.result @@ -13,4 +13,4 @@ drop user user1@localhost; # # MDEV-8491 - On shutdown, report the user and the host executed that. # -FOUND 2 /mysqld(\.exe)? \(initiated by: root\[root\] @ localhost \[(::1)?\]\): Normal shutdown/ in mysqld.1.err +FOUND 3 /(mysqld|mariadbd)(\.exe)? \(initiated by: root\[root\] @ localhost \[(::1)?\]\): Normal shutdown/ in mysqld.1.err diff --git a/mysql-test/main/shutdown.test b/mysql-test/main/shutdown.test index e423725177b..69616f535b2 100644 --- a/mysql-test/main/shutdown.test +++ b/mysql-test/main/shutdown.test @@ -34,5 +34,5 @@ drop user user1@localhost; --echo # MDEV-8491 - On shutdown, report the user and the host executed that. --echo # --let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err ---let SEARCH_PATTERN=mysqld(\.exe)? \(initiated by: root\[root\] @ localhost \[(::1)?\]\): Normal shutdown +--let SEARCH_PATTERN=(mysqld|mariadbd)(\.exe)? \(initiated by: root\[root\] @ localhost \[(::1)?\]\): Normal shutdown --source include/search_pattern_in_file.inc diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 4989e43941e..98d20fa8fc3 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2154,7 +2154,7 @@ sub find_mysqld { my ($mysqld_basedir)= $ENV{MTR_BINDIR}|| @_; - my @mysqld_names= ("mysqld", "mysqld-max-nt", "mysqld-max", + my @mysqld_names= ("mariadbd", "mysqld", "mysqld-max-nt", "mysqld-max", "mysqld-nt"); if ( $opt_debug_server ){ |