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

Merge mysql.com:/home/hf/work/25097/my50-25097

Browse Source 
into  mysql.com:/home/hf/work/25097/my51-25097


client/mysql.cc:
  Auto merged
include/sql_common.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql-common/client.c:
  merging
sql/log.cc:
  merging
This commit is contained in:
unknown
2008-02-27 13:00:59 +04:00
parent 78e19d4283 a4b0a2cf67
commit 33c4301922
6 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/mysql.cc
View File

@ -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);