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

Merging conflicts resolved

Browse Source 
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Libraries changed
mysys/default.c:
  get_defaults_files implementation added
sql/sql_base.cc:
  merging
sql/sql_show.cc:
  merging
This commit is contained in:
unknown
2005-01-11 21:00:53 +04:00
parent d067695909 7bb97a4ad8
commit 4f113ac4f3
16 changed files with 142 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/mysql.cc
View File

@ -330,6 +330,16 @@ static sig_handler mysql_end(int sig);
int main(int argc,char *argv[])
{
char buff[80];
char *defaults, *extra_defaults;
char *emb_argv[3];
int emb_argc= 1;
emb_argv[0]= argv[0];
get_defaults_files(argc, argv, &defaults, &extra_defaults);
if (defaults)
emb_argv[emb_argc++]= defaults;
if (extra_defaults)
emb_argv[emb_argc++]= extra_defaults;
MY_INIT(argv[0]);
DBUG_ENTER("main");
@ -375,7 +385,7 @@ int main(int argc,char *argv[])
my_end(0);
exit(1);
}
if (mysql_server_init(0, NULL, (char**) server_default_groups))
if (mysql_server_init(emb_argc, emb_argv, (char**) server_default_groups))
{
free_defaults(defaults_argv);
my_end(0);