diff options
| author | unknown <kaa@kaamos.(none)> | 2008-03-12 10:59:15 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-03-12 10:59:15 +0300 |
| commit | 09f8a4af63b5366505dfe56cb53e0ac26042eea1 (patch) | |
| tree | 8e11254a0548ae9300008dac84cbfef339906922 /client | |
| parent | 4d09306dd19820a742b003417d83f76f5d3633f3 (diff) | |
| parent | 0abcb8ca5e3662d230446907469dc4facbb755ad (diff) | |
| download | mariadb-git-09f8a4af63b5366505dfe56cb53e0ac26042eea1.tar.gz | |
Merge kaamos.(none):/data/src/mysql-5.0
into kaamos.(none):/data/src/opt/mysql-5.0-opt
client/mysql.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/view.result:
Manual merge.
mysql-test/t/view.test:
Manual merge.
scripts/mysql_config.sh:
Manual merge.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 1 | ||||
| -rw-r--r-- | client/mysqldump.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 0a1c1954ea2..483b1829ec0 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1125,6 +1125,7 @@ int main(int argc,char *argv[]) } if (mysql_server_init(emb_argc, emb_argv, (char**) server_default_groups)) { + put_error(NULL); free_defaults(defaults_argv); my_end(0); exit(1); diff --git a/client/mysqldump.c b/client/mysqldump.c index 980013d539a..e8129a6fd73 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -3285,6 +3285,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); |