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

fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)

Browse Source 
client/mysql.cc:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  defaults files handled
include/my_sys.h:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  get_defaults_file interface added
libmysqld/libmysqld.c:
  just small fix, not related to the bug.
mysys/default.c:
  bug #5920 (embedded-server mysql doesn't handle --defaults-file)
  get_defaults_files implementation
This commit is contained in:
unknown
2005-01-03 19:21:54 +04:00
parent a77d4ce272
commit d3be3cbcfd
4 changed files with 55 additions and 17 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);