Skip to content

Commit 7afc6ee

Browse files
grooverdangrooverdan
committed
MDEV-29615 mtr to use mariadb names
1 parent 99e14aa commit 7afc6ee

14 files changed

+115
-114
lines changed

‎mysql-test/main/bug47671.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
--echo # Bug#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39
66
--echo #
77
--echo # Extract only charset information from 'status' command output using regex
8-
--replace_regex /.*mysql.*// /Connection.*// /Current.*// /SSL.*// /Using.*// /Server version.*// /Protocol.*// /UNIX.*// /Uptime.*// /Threads.*// /TCP.*//
8+
--replace_regex /.*mariadb.*// /Connection.*// /Current.*// /SSL.*// /Using.*// /Server version.*// /Protocol.*// /UNIX.*// /Uptime.*// /Threads.*// /TCP.*//
99
--exec $MYSQL -e "status";

‎mysql-test/main/mysqladmin.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
mysqld is alive
2-
mysqladmin: unknown variable 'database=db1'
3-
Warning: mysqladmin: unknown variable 'loose-database=db2'
2+
mariadb-admin: unknown variable 'database=db1'
3+
Warning: mariadb-admin: unknown variable 'loose-database=db2'
44
mysqld is alive
55
#
66
# Bug#58221 : mysqladmin --sleep=x --count=x keeps looping

‎mysql-test/main/mysqladmin.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
# Bug#10608 mysqladmin breaks on "database" variable in my.cnf
1212
#
1313

14-
--replace_regex /.*mysqladmin.*: unknown/mysqladmin: unknown/
14+
--replace_regex /.*mariadb-admin.*: unknown/mariadb-admin: unknown/
1515
--error 7
1616
--exec $MYSQLADMIN --database=db1 --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1
1717

1818
# When mysqladmin finds "loose-database" it shall print
1919
# a warning and continue
20-
--replace_regex /Warning: .*mysqladmin.*: unknown/Warning: mysqladmin: unknown/
20+
--replace_regex /Warning: .*mariadb-admin.*: unknown/Warning: mariadb-admin: unknown/
2121
--exec $MYSQLADMIN --loose-database=db2 --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1
2222

2323
--echo #

‎mysql-test/main/mysqlbinlog.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ Alternatives are: 'NEVER','AUTO','UNSPEC','DECODE-ROWS'
886886
#
887887
# Expect error for incomplete --base64-output argument.
888888
# MYSQL_BINLOG std_data/master-bin.000001 --base64-output 2>&1
889-
mysqlbinlog: option '--base64-output' requires an argument
889+
mariadb-binlog: option '--base64-output' requires an argument
890890
#
891891
# Ensure --base64-output=auto outputs the same result as unspecified
892892
# MYSQL_BINLOG -v MYSQLD_DATADIR/master-bin.000001 > MYSQLTEST_VARDIR/tmp/mysqlbinlog_nob64spec.out
@@ -1267,7 +1267,7 @@ DELIMITER ;
12671267
ROLLBACK /* added by mysqlbinlog */;
12681268
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
12691269
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
1270-
mysqlbinlog Ver VER for OS at ARCH
1270+
mariadb-binlog Ver VER for OS at ARCH
12711271
#
12721272
# Test --rewrite-db
12731273
#

‎mysql-test/main/mysqlbinlog.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog.warn;
533533
--echo # Expect error for incomplete --base64-output argument.
534534
--echo # MYSQL_BINLOG std_data/master-bin.000001 --base64-output 2>&1
535535
# The error produces the absolute path of the mysqlbinlog executable, remove it.
536-
--replace_regex /.*mysqlbinlog.*:/mysqlbinlog:/i
536+
--replace_regex /.*mariadb-binlog.*:/mariadb-binlog:/i
537537
--error 1
538538
--exec $MYSQL_BINLOG std_data/master-bin.000001 --base64-output 2>&1
539539

@@ -608,7 +608,7 @@ eval SET GLOBAL SERVER_ID = $old_server_id;
608608
#
609609
# MDEV-12372 mysqlbinlog --version output is the same on 10.x as on 5.5.x, and contains not only version
610610
#
611-
replace_regex /.*mysqlbinlog(\.exe)? Ver .* for .* at [-_a-zA-Z0-9]+/mysqlbinlog Ver VER for OS at ARCH/;
611+
replace_regex /.*mariadb-binlog(\.exe)? Ver .* for .* at [-_a-zA-Z0-9]+/mariadb-binlog Ver VER for OS at ARCH/;
612612
exec $MYSQL_BINLOG --version;
613613

614614
--echo #

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mysqldump: Error: Binlogging on server not active
1+
mariadb-dump: Error: Binlogging on server not active

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
--source include/not_embedded.inc
33

44
--replace_regex /MASTER_LOG_POS=[0-9]+/XX/
5-
--replace_result mysqldump.exe mysqldump
5+
--replace_result mariadb-dump.exe mariadb-dump
66
--error 2
77
--exec $MYSQL_DUMP --compact --master-data=2 test 2>&1

‎mysql-test/main/mysqldump.result

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,22 +1641,22 @@ create table t2(a varchar(30) primary key, b int not null);
16411641
create table t3(a varchar(30) primary key, b int not null);
16421642
test_sequence
16431643
------ Testing with illegal table names ------
1644-
mysqldump: Couldn't find table: "\d-2-1.sql"
1645-
mysqldump: Couldn't find table: "\t1"
1646-
mysqldump: Couldn't find table: "\t1"
1647-
mysqldump: Couldn't find table: "\\t1"
1648-
mysqldump: Couldn't find table: "t\1"
1649-
mysqldump: Couldn't find table: "t\1"
1650-
mysqldump: Couldn't find table: "t/1"
1651-
mysqldump: Couldn't find table: "T_1"
1652-
mysqldump: Couldn't find table: "T%1"
1653-
mysqldump: Couldn't find table: "T'1"
1654-
mysqldump: Couldn't find table: "T_1"
1655-
mysqldump: Couldn't find table: "T_"
1644+
mariadb-dump: Couldn't find table: "\d-2-1.sql"
1645+
mariadb-dump: Couldn't find table: "\t1"
1646+
mariadb-dump: Couldn't find table: "\t1"
1647+
mariadb-dump: Couldn't find table: "\\t1"
1648+
mariadb-dump: Couldn't find table: "t\1"
1649+
mariadb-dump: Couldn't find table: "t\1"
1650+
mariadb-dump: Couldn't find table: "t/1"
1651+
mariadb-dump: Couldn't find table: "T_1"
1652+
mariadb-dump: Couldn't find table: "T%1"
1653+
mariadb-dump: Couldn't find table: "T'1"
1654+
mariadb-dump: Couldn't find table: "T_1"
1655+
mariadb-dump: Couldn't find table: "T_"
16561656
test_sequence
16571657
------ Testing with illegal database names ------
1658-
mysqldump: Got error: 1049: "Unknown database 'mysqldump_test_d'" when selecting the database
1659-
mysqldump: Got error: 1049: "Unknown database 'mysqld\ump_test_db'" when selecting the database
1658+
mariadb-dump: Got error: 1049: "Unknown database 'mysqldump_test_d'" when selecting the database
1659+
mariadb-dump: Got error: 1049: "Unknown database 'mysqld\ump_test_db'" when selecting the database
16601660
drop table t1, t2, t3;
16611661
drop database mysqldump_test_db;
16621662
use test;
@@ -1866,7 +1866,7 @@ drop table `t1`;
18661866
create table t1(a int);
18671867
create table t2(a int);
18681868
create table t3(a int);
1869-
mysqldump: Couldn't find table: "non_existing"
1869+
mariadb-dump: Couldn't find table: "non_existing"
18701870

18711871
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
18721872
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1914,8 +1914,8 @@ drop table t1, t2, t3;
19141914
# Bug#21288 mysqldump segmentation fault when using --where
19151915
#
19161916
create table t1 (a int);
1917-
mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ `a` FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)
1918-
mysqldump: Got error: 1064: "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1" when retrieving data from server
1917+
mariadb-dump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ `a` FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)
1918+
mariadb-dump: Got error: 1064: "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1" when retrieving data from server
19191919

19201920
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
19211921
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3444,8 +3444,8 @@ create table t1 ( id serial );
34443444
create view v1 as select * from t1;
34453445
drop table t1;
34463446
mysqldump {
3447-
mysqldump: Got error: 1356: "View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them" when using LOCK TABLES
3448-
mysqldump: Couldn't execute 'SHOW FIELDS FROM `v1`': View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them (1356)
3447+
mariadb-dump: Got error: 1356: "View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them" when using LOCK TABLES
3448+
mariadb-dump: Couldn't execute 'SHOW FIELDS FROM `v1`': View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them (1356)
34493449

34503450
-- failed on view `v1`: CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `test`.`t1`.`id` AS `id` from `t1`
34513451

@@ -3619,11 +3619,11 @@ use test;
36193619
create user mysqltest_1@localhost;
36203620
create table t1(a int, b varchar(34));
36213621
reset master;
3622-
mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
3623-
mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
3622+
mariadb-dump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
3623+
mariadb-dump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
36243624
grant RELOAD on *.* to mysqltest_1@localhost;
3625-
mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, BINLOG MONITOR privilege(s) for this operation (1227)
3626-
mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, BINLOG MONITOR privilege(s) for this operation (1227)
3625+
mariadb-dump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, BINLOG MONITOR privilege(s) for this operation (1227)
3626+
mariadb-dump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, BINLOG MONITOR privilege(s) for this operation (1227)
36273627
grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
36283628
drop table t1;
36293629
drop user mysqltest_1@localhost;
@@ -3738,10 +3738,10 @@ DROP TABLE t1;
37383738
#
37393739
CREATE TABLE t1(a int);
37403740
INSERT INTO t1 VALUES (1), (2);
3741-
mysqldump: Input filename too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
3742-
mysqldump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
3743-
mysqldump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
3744-
mysqldump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
3741+
mariadb-dump: Input filename too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
3742+
mariadb-dump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
3743+
mariadb-dump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
3744+
mariadb-dump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
37453745
DROP TABLE t1;
37463746
CREATE TABLE t2 (a INT) ENGINE=MyISAM;
37473747
CREATE TABLE t3 (a INT) ENGINE=MyISAM;
@@ -3835,7 +3835,7 @@ grant all privileges on mysqldump_test_db.* to user2;
38353835
connect user27293,localhost,user1,,mysqldump_test_db,$MASTER_MYPORT,$MASTER_MYSOCK;
38363836
connection user27293;
38373837
create procedure mysqldump_test_db.sp1() select 'hello';
3838-
mysqldump: user2 has insufficient privileges to SHOW CREATE PROCEDURE `sp1`!
3838+
mariadb-dump: user2 has insufficient privileges to SHOW CREATE PROCEDURE `sp1`!
38393839

38403840
-- insufficient privileges to SHOW CREATE PROCEDURE `sp1`
38413841
-- does user2 have permissions on mysql.proc?
@@ -4067,7 +4067,7 @@ UNLOCK TABLES;
40674067
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
40684068
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
40694069

4070-
mysqldump: Got error: 1146: "Table 'test.???????????????????????' doesn't exist" when using LOCK TABLES
4070+
mariadb-dump: Got error: 1146: "Table 'test.???????????????????????' doesn't exist" when using LOCK TABLES
40714071
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
40724072
/*!40103 SET TIME_ZONE='+00:00' */;
40734073
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -4291,7 +4291,7 @@ Abernathy
42914291
aberrant
42924292
aberration
42934293
drop table words;
4294-
mysqlimport: Error: 1146, Table 'test.words' doesn't exist, when using table: words
4294+
mariadb-import: Error: 1146, Table 'test.words' doesn't exist, when using table: words
42954295
drop table t1;
42964296
drop table t2;
42974297
drop table words2;
@@ -4612,8 +4612,8 @@ CREATE TABLE t1 (a INT, b CHAR(10) CHARSET koi8r, c CHAR(10) CHARSET latin1);
46124612
CREATE TABLE t2 LIKE t1;
46134613
INSERT INTO t1 VALUES (1, 'ABC-АБВ', 'DEF-ÂÃÄ'), (2, NULL, NULL);
46144614
# error on multi-character ENCLOSED/ESCAPED BY
4615-
mysqldump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
4616-
mysqldump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
4615+
mariadb-dump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
4616+
mariadb-dump: Got error: 1083: "Field separator argument is not what is expected; check the manual" when executing 'SELECT INTO OUTFILE'
46174617
# default '--default-charset' (binary):
46184618
##################################################
46194619
1 ABC-��� DEF-���
@@ -5100,7 +5100,7 @@ connection conn_1;
51005100
<field name="c1">3</field>
51015101
</row>
51025102
</table_data>
5103-
mysqldump: user1 has insufficient privileges to SHOW CREATE FUNCTION `hello1`!
5103+
mariadb-dump: user1 has insufficient privileges to SHOW CREATE FUNCTION `hello1`!
51045104
<triggers name="t2">
51055105
<trigger Trigger="trig1" sql_mode="" character_set_client="latin1" collation_connection="latin1_swedish_ci" Database_Collation="latin1_swedish_ci" Created="--TIME--">
51065106
<![CDATA[
@@ -5404,13 +5404,13 @@ ROUTINE_NAME
54045404
proc
54055405
one
54065406
DROP DATABASE bug25717383;
5407-
mysqldump: Got error: 2005: "Unknown MySQL server host 'unknownhost'" when trying to connect
5408-
mysqldump: Couldn't execute 'SHOW SLAVE STATUS': MySQL server has gone away (2006)
5409-
Usage: mysqldump [OPTIONS] database [tables]
5410-
OR mysqldump [OPTIONS] --databases DB1 [DB2 DB3...]
5411-
OR mysqldump [OPTIONS] --all-databases
5412-
OR mysqldump [OPTIONS] --system=[SYSTEMOPTIONS]]
5413-
For more options, use mysqldump --help
5407+
mariadb-dump: Got error: 2005: "Unknown MySQL server host 'unknownhost'" when trying to connect
5408+
mariadb-dump: Couldn't execute 'SHOW SLAVE STATUS': MySQL server has gone away (2006)
5409+
Usage: mariadb-dump [OPTIONS] database [tables]
5410+
OR mariadb-dump [OPTIONS] --databases DB1 [DB2 DB3...]
5411+
OR mariadb-dump [OPTIONS] --all-databases
5412+
OR mariadb-dump [OPTIONS] --system=[SYSTEMOPTIONS]]
5413+
For more options, use mariadb-dump --help
54145414
#
54155415
# MDEV-9001 - [PATCH] Fix DB name quoting in mysqldump --routine
54165416
#
@@ -5635,7 +5635,7 @@ t1_id int,
56355635
CONSTRAINT fk
56365636
FOREIGN KEY (t1_id) REFERENCES t1 (id)
56375637
) ENGINE = InnoDB;
5638-
mysqlimport: Error: 1452, Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `fk` FOREIGN KEY (`t1_id`) REFERENCES `t1` (`id`)), when using table: t2
5638+
mariadb-import: Error: 1452, Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `fk` FOREIGN KEY (`t1_id`) REFERENCES `t1` (`id`)), when using table: t2
56395639
select count(*) from t2;
56405640
count(*)
56415641
1

0 commit comments

Comments
 (0)