MDEV-29615 mtr to use mariadb names

mysql-test/main/bug47671.test

@@ -5,5 +5,5 @@
 --echo # Bug#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39
 --echo #
 --echo # Extract only charset information from 'status' command output using regex
---replace_regex /.*mysql.*// /Connection.*// /Current.*//  /SSL.*// /Using.*// /Server version.*// /Protocol.*// /UNIX.*// /Uptime.*// /Threads.*// /TCP.*//
+--replace_regex /.*mariadb.*// /Connection.*// /Current.*//  /SSL.*// /Using.*// /Server version.*// /Protocol.*// /UNIX.*// /Uptime.*// /Threads.*// /TCP.*//
 --exec $MYSQL -e "status";

mysql-test/main/mysqladmin.result

 mysqld is alive
-mysqladmin: unknown variable 'database=db1'
-Warning: mysqladmin: unknown variable 'loose-database=db2'
+mariadb-admin: unknown variable 'database=db1'
+Warning: mariadb-admin: unknown variable 'loose-database=db2'
 mysqld is alive
 #
 # Bug#58221 : mysqladmin --sleep=x --count=x keeps looping

mysql-test/main/mysqladmin.test

@@ -11,13 +11,13 @@
 # Bug#10608 mysqladmin breaks on "database" variable in my.cnf
 #
 
---replace_regex /.*mysqladmin.*: unknown/mysqladmin: unknown/
+--replace_regex /.*mariadb-admin.*: unknown/mariadb-admin: unknown/
 --error 7
 --exec $MYSQLADMIN --database=db1 --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT  -u root --password= ping 2>&1
 
 # When mysqladmin finds "loose-database" it shall print
 # a warning and continue
---replace_regex /Warning: .*mysqladmin.*: unknown/Warning: mysqladmin: unknown/
+--replace_regex /Warning: .*mariadb-admin.*: unknown/Warning: mariadb-admin: unknown/
 --exec $MYSQLADMIN --loose-database=db2 --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT  -u root --password= ping 2>&1
 
 --echo #

mysql-test/main/mysqlbinlog.result

@@ -886,7 +886,7 @@ Alternatives are: 'NEVER','AUTO','UNSPEC','DECODE-ROWS'
 #
 # Expect error for incomplete --base64-output argument.
 # MYSQL_BINLOG  std_data/master-bin.000001 --base64-output 2>&1
-mysqlbinlog: option '--base64-output' requires an argument
+mariadb-binlog: option '--base64-output' requires an argument
 #
 # Ensure --base64-output=auto outputs the same result as unspecified
 # MYSQL_BINLOG -v MYSQLD_DATADIR/master-bin.000001 > MYSQLTEST_VARDIR/tmp/mysqlbinlog_nob64spec.out
@@ -1267,7 +1267,7 @@ DELIMITER ;
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
-mysqlbinlog Ver VER for OS at ARCH
+mariadb-binlog Ver VER for OS at ARCH
 #
 # Test --rewrite-db
 #

mysql-test/main/mysqlbinlog.test

@@ -533,7 +533,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.warn;
 --echo # Expect error for incomplete --base64-output argument.
 --echo # MYSQL_BINLOG  std_data/master-bin.000001 --base64-output 2>&1
 # The error produces the absolute path of the mysqlbinlog executable, remove it.
---replace_regex /.*mysqlbinlog.*:/mysqlbinlog:/i
+--replace_regex /.*mariadb-binlog.*:/mariadb-binlog:/i
 --error 1
 --exec $MYSQL_BINLOG std_data/master-bin.000001 --base64-output 2>&1
 
@@ -608,7 +608,7 @@ eval SET GLOBAL SERVER_ID = $old_server_id;
 #
 # MDEV-12372 mysqlbinlog --version output is the same on 10.x as on 5.5.x, and contains not only version
 #
-replace_regex /.*mysqlbinlog(\.exe)? Ver .* for .* at [-_a-zA-Z0-9]+/mysqlbinlog Ver VER for OS at ARCH/;
+replace_regex /.*mariadb-binlog(\.exe)? Ver .* for .* at [-_a-zA-Z0-9]+/mariadb-binlog Ver VER for OS at ARCH/;
 exec $MYSQL_BINLOG --version;
 
 --echo #

mysql-test/main/mysqldump-no-binlog.result

-mysqldump: Error: Binlogging on server not active
+mariadb-dump: Error: Binlogging on server not active

mysql-test/main/mysqldump-no-binlog.test

@@ -2,6 +2,6 @@
 --source include/not_embedded.inc
 
 --replace_regex /MASTER_LOG_POS=[0-9]+/XX/
---replace_result mysqldump.exe mysqldump
+--replace_result mariadb-dump.exe mariadb-dump
 --error 2
 --exec $MYSQL_DUMP --compact --master-data=2 test 2>&1

mysql-test/main/openssl_1.result

@@ -179,7 +179,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
-mysqldump: Got error: 2026: "TLS/SSL error: xxxx
+mariadb-dump: Got error: 2026: "TLS/SSL error: xxxx
 DROP TABLE t1;
 GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509;
 FLUSH PRIVILEGES;

mysql-test/main/openssl_1.test

@@ -174,7 +174,7 @@ INSERT INTO t1 VALUES (1), (2);
 --exec $MYSQL_DUMP --default-character-set=utf8mb4 --skip-create-options --skip-comments --ssl --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test
 
 # With wrong parameters
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR mysqldump.exe mysqldump
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MYSQL_DUMP mariadb-dump .\exe ''
 --replace_regex /TLS\/SSL error.*/TLS\/SSL error: xxxx/
 --error 2
 --exec $MYSQL_DUMP --default-character-set=utf8mb4 --skip-create-options --skip-comments --ssl --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test 2>&1

mysql-test/main/ssl_crl_clients.result

@@ -6,8 +6,8 @@ ERROR 2026 (HY000): TLS/SSL error: certificate revoked
 ERROR 2026 (HY000): TLS/SSL error: certificate revoked
 ############ Test mysqladmin ##############
 # Test mysqladmin connecting to a server with a certificate revoked by -crl
-mysqladmin: connect to server at 'localhost' failed
+mariadb-admin: connect to server at 'localhost' failed
 error: 'TLS/SSL error: certificate revoked'
 # Test mysqladmin connecting to a server with a certificate revoked by -crlpath
-mysqladmin: connect to server at 'localhost' failed
+mariadb-admin: connect to server at 'localhost' failed
 error: 'TLS/SSL error: certificate revoked'

mysql-test/main/ssl_crl_clients.test

@@ -34,11 +34,11 @@ copy_file $MYSQL_TEST_DIR/std_data/server-cert.crl $MYSQL_TMP_DIR/ed1f42db.r0;
 let $admin_suffix = --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping;
 
 --echo # Test mysqladmin connecting to a server with a certificate revoked by -crl
---replace_regex /.*mysqladmin.*:/mysqladmin:/ /TLS\/SSL error: .*CRYPT_E_REVOKED./TLS\/SSL error: certificate revoked/
+--replace_regex /.*mariadb-admin.*:/mariadb-admin:/ /TLS\/SSL error: .*CRYPT_E_REVOKED./TLS\/SSL error: certificate revoked/
 --error 1
 --exec $MYSQLADMIN $ssl_crl $admin_suffix 2>&1
 
 --echo # Test mysqladmin connecting to a server with a certificate revoked by -crlpath
---replace_regex /.*mysqladmin.*:/mysqladmin:/ /TLS\/SSL error: .*CRYPT_E_REVOKED./TLS\/SSL error: certificate revoked/
+--replace_regex /.*mariadb-admin.*:/mariadb-admin:/ /TLS\/SSL error: .*CRYPT_E_REVOKED./TLS\/SSL error: certificate revoked/
 --error 1
 --exec $MYSQLADMIN $ssl_crlpath $admin_suffix 2>&1

mysql-test/mysql-test-run.pl

@@ -1835,9 +1835,9 @@ sub executable_setup () {
   $exe_patch='patch' if `patch -v`;
 
   # Look for the client binaries
-  $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");
-  $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
-  $exe_mysql_plugin=   mtr_exe_exists("$path_client_bindir/mysql_plugin");
+  $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mariadb-admin");
+  $exe_mysql=          mtr_exe_exists("$path_client_bindir/mariadb");
+  $exe_mysql_plugin=   mtr_exe_exists("$path_client_bindir/mariadb-plugin");
   $exe_mariadb_conv=   mtr_exe_exists("$path_client_bindir/mariadb-conv");
 
   $exe_mysql_embedded= mtr_exe_maybe_exists("$bindir/libmysqld/examples/mysql_embedded");
@@ -1860,7 +1860,7 @@ sub executable_setup () {
     }
     else
     {
-      $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mysqltest");
+      $exe_mysqltest= mtr_exe_exists("$path_client_bindir/mariadb-test");
     }
   }
 
@@ -1871,7 +1871,7 @@ sub client_debug_arg($$) {
   my ($args, $client_name)= @_;
 
   # Workaround for Bug #50627: drop any debug opt
-  return if $client_name =~ /^mysqlbinlog/;
+  return if $client_name =~ /^mariadb-binlog/;
 
   if ( $opt_debug ) {
     mtr_add_arg($args,
@@ -1902,7 +1902,7 @@ sub client_arguments ($;$) {
 
 
 sub mysqlbinlog_arguments () {
-  my $exe= mtr_exe_exists("$path_client_bindir/mysqlbinlog");
+  my $exe= mtr_exe_exists("$path_client_bindir/mariadb-binlog");
 
   my $args;
   mtr_init_args(\$args);
@@ -1914,14 +1914,14 @@ sub mysqlbinlog_arguments () {
 
 
 sub mysqlslap_arguments () {
-  my $exe= mtr_exe_maybe_exists("$path_client_bindir/mysqlslap");
+  my $exe= mtr_exe_maybe_exists("$path_client_bindir/mariadb-slap");
   if ( $exe eq "" ) {
     # mysqlap was not found
 
     if (defined $mysql_version_id and $mysql_version_id >= 50100 ) {
-      mtr_error("Could not find the mysqlslap binary");
+      mtr_error("Could not find the mariadb-slap binary");
     }
-    return ""; # Don't care about mysqlslap
+    return ""; # Don't care about mariadb-slap
   }
 
   my $args;
@@ -1934,7 +1934,7 @@ sub mysqlslap_arguments () {
 
 sub mysqldump_arguments ($) {
   my($group_suffix) = @_;
-  my $exe= mtr_exe_exists("$path_client_bindir/mysqldump");
+  my $exe= mtr_exe_exists("$path_client_bindir/mariadb-dump");
 
   my $args;
   mtr_init_args(\$args);
@@ -2109,17 +2109,17 @@ sub environment_setup {
   # ----------------------------------------------------
   # mysql clients
   # ----------------------------------------------------
-  $ENV{'MYSQL_CHECK'}=              client_arguments("mysqlcheck");
+  $ENV{'MYSQL_CHECK'}=              client_arguments("mariadb-check");
   $ENV{'MYSQL_DUMP'}=               mysqldump_arguments(".1");
   $ENV{'MYSQL_DUMP_SLAVE'}=         mysqldump_arguments(".2");
   $ENV{'MYSQL_SLAP'}=               mysqlslap_arguments();
-  $ENV{'MYSQL_IMPORT'}=             client_arguments("mysqlimport");
-  $ENV{'MYSQL_SHOW'}=               client_arguments("mysqlshow");
+  $ENV{'MYSQL_IMPORT'}=             client_arguments("mariadb-import");
+  $ENV{'MYSQL_SHOW'}=               client_arguments("mariadb-show");
   $ENV{'MYSQL_BINLOG'}=             mysqlbinlog_arguments();
-  $ENV{'MYSQL'}=                    client_arguments("mysql");
-  $ENV{'MYSQL_SLAVE'}=              client_arguments("mysql", ".2");
-  $ENV{'MYSQL_UPGRADE'}=            client_arguments("mysql_upgrade");
-  $ENV{'MYSQLADMIN'}=               client_arguments("mysqladmin");
+  $ENV{'MYSQL'}=                    client_arguments("mariadb");
+  $ENV{'MYSQL_SLAVE'}=              client_arguments("mariadb", ".2");
+  $ENV{'MYSQL_UPGRADE'}=            client_arguments("mariadb-upgrade");
+  $ENV{'MYSQLADMIN'}=               client_arguments("mariadb-admin");
   $ENV{'MYSQL_CLIENT_TEST'}=        mysql_client_test_arguments();
   $ENV{'EXE_MYSQL'}=                $exe_mysql;
   $ENV{'MYSQL_PLUGIN'}=             $exe_mysql_plugin;
@@ -2127,8 +2127,8 @@ sub environment_setup {
   $ENV{'MARIADB_CONV'}=             $exe_mariadb_conv;
   if(IS_WINDOWS)
   {
-     $ENV{'MYSQL_INSTALL_DB_EXE'}=  mtr_exe_exists("$bindir/sql$multiconfig/mysql_install_db",
-       "$bindir/bin/mysql_install_db");
+     $ENV{'MYSQL_INSTALL_DB_EXE'}=  mtr_exe_exists("$bindir/sql$multiconfig/mariadb-install-db",
+       "$bindir/bin/mariadb-install-db");
   }
 
   my $client_config_exe=
@@ -2211,9 +2211,9 @@ sub environment_setup {
   # ----------------------------------------------------
   # mysql_tzinfo_to_sql
   # ----------------------------------------------------
-  my $exe_mysql_tzinfo_to_sql= mtr_exe_exists("$basedir/sql$multiconfig/mysql_tzinfo_to_sql",
-                                 "$path_client_bindir/mysql_tzinfo_to_sql",
-                                 "$bindir/sql$multiconfig/mysql_tzinfo_to_sql");
+  my $exe_mysql_tzinfo_to_sql= mtr_exe_exists("$basedir/sql$multiconfig/mariadb-tzinfo-to-sql",
+                                 "$path_client_bindir/mariadb-tzinfo-to-sql",
+                                 "$bindir/sql$multiconfig/mariadb-tzinfo-to-sql");
   $ENV{'MYSQL_TZINFO_TO_SQL'}= native_path($exe_mysql_tzinfo_to_sql);
 
   # ----------------------------------------------------