diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-07 11:19:51 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-07 11:19:51 +0200 |
| commit | 0eed115a52be78f6a461fb4a97c0c5a15013898b (patch) | |
| tree | b6161b37ada1be294778e69a5c102cac151a43cd /client | |
| parent | fa9a16de83a6bd9564d1e4ae1d1705685a5abd45 (diff) | |
| parent | 99c0b5e10ff2f64df6b3d90096be0ece31130dcb (diff) | |
| download | mariadb-git-0eed115a52be78f6a461fb4a97c0c5a15013898b.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B34909-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B34909-5.1-opt
client/mysqldump.c:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index f119e0b40b0..cf66ec89919 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -4306,6 +4306,7 @@ static int do_show_master_status(MYSQL *mysql_con) my_printf_error(0, "Error: Binlogging on server not active", MYF(0)); mysql_free_result(master); + maybe_exit(EX_MYSQLERR); return 1; } mysql_free_result(master); |