database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/autopush/B34909-5.0-opt
This commit is contained in:
unknown
2008-03-07 11:17:31 +02:00
parent 8b5189c3ac 99c0b5e10f
commit a104844dda
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/mysqldump.c
View File

@ -3285,6 +3285,7 @@ static int do_show_master_status(MYSQL *mysql_con)
my_printf_error(0, "Error: Binlogging on server not active", my_printf_error(0, "Error: Binlogging on server not active",
MYF(0)); MYF(0));
mysql_free_result(master); mysql_free_result(master);
maybe_exit(EX_MYSQLERR);
return 1; return 1;
} }
mysql_free_result(master); mysql_free_result(master);

1
mysql-test/r/mysqldump-no-binlog.result Normal file
View File

@ -0,0 +1 @@
mysqldump: Error: Binlogging on server not active

1
mysql-test/t/mysqldump-no-binlog-master.opt Normal file
View File

@ -0,0 +1 @@
--skip-log-bin

6
mysql-test/t/mysqldump-no-binlog.test Normal file
View File

@ -0,0 +1,6 @@
# Embedded server doesn't support external clients
--source include/not_embedded.inc
--replace_regex /MASTER_LOG_POS=[0-9]+/XX/
--error 2
--exec $MYSQL_DUMP --compact --master-data=2 test 2>&1