diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2008-02-27 13:54:34 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2008-02-27 13:54:34 +0400 |
| commit | 68b21ebb837e66b85a177fa357bcce4d23c8268f (patch) | |
| tree | 400c33fa02a0f639257326cd5b0688eb15587fff /client | |
| parent | da0a2e43971a46caaab85baa806ebb7db4f8f630 (diff) | |
| parent | 4a8c442f040db67763697df8f109f79ec6240979 (diff) | |
| download | mariadb-git-68b21ebb837e66b85a177fa357bcce4d23c8268f.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/25097/my51-25097
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/log.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 1d673348f58..682ab077b94 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -421,6 +421,7 @@ int main(int argc,char *argv[]) if (mysql_server_init(embedded_server_arg_count, embedded_server_args, (char**) embedded_server_groups)) { + put_error(NULL); free_defaults(defaults_argv); my_end(0); exit(1); |