#At file:///Users/kaa/src/bzr/bugteam/bug40552/my51-bug40552/ based on revid:azundris@stripped
2812 Alexey Kopytov 2009-02-25
Fix for bug #40552: Race condition around default_directories
in load_defaults()
load_defaults(), my_search_option_files() and
my_print_default_files() utilized a global variable
containing a pointer to thread local memory. This could lead
to race conditions when those functions were called with high
concurrency.
Fixed by changing the interface of the said functions to avoid
the necessity for using a global variable.
modified:
client/mysql.cc
client/mysql_upgrade.c
client/mysqladmin.cc
client/mysqlbinlog.cc
client/mysqlcheck.c
client/mysqldump.c
client/mysqlimport.c
client/mysqlshow.c
client/mysqlslap.c
client/mysqltest.cc
extra/my_print_defaults.c
include/my_sys.h
mysys/default.c
server-tools/instance-manager/instance_map.cc
server-tools/instance-manager/options.cc
server-tools/instance-manager/options.h
sql-common/client.c
sql/mysqld.cc
storage/archive/archive_reader.c
storage/myisam/myisamchk.c
storage/myisam/myisampack.c
storage/ndb/src/cw/cpcd/main.cpp
storage/ndb/src/kernel/vm/Configuration.cpp
storage/ndb/src/mgmclient/main.cpp
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
storage/ndb/src/mgmsrv/main.cpp
storage/ndb/tools/delete_all.cpp
storage/ndb/tools/desc.cpp
storage/ndb/tools/drop_index.cpp
storage/ndb/tools/drop_tab.cpp
storage/ndb/tools/listTables.cpp
storage/ndb/tools/ndb_config.cpp
storage/ndb/tools/restore/restore_main.cpp
storage/ndb/tools/select_all.cpp
storage/ndb/tools/select_count.cpp
storage/ndb/tools/waiter.cpp
tests/mysql_client_test.c
per-file messages:
include/my_sys.h
Changed interfaces for load_defaults() and
my_search_option_files()
mysys/default.c
Changed load_defaults(), my_search_option_files() and
my_print_default_files() to avoid usage of a global variable.
=== modified file 'client/mysql.cc'
--- a/client/mysql.cc 2009-02-24 08:33:04 +0000
+++ b/client/mysql.cc 2009-02-25 14:29:49 +0000
@@ -1108,7 +1108,7 @@ int main(int argc,char *argv[])
close(stdout_fileno_copy); /* Clean up dup(). */
}
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
defaults_argv=argv;
if (get_options(argc, (char **) argv))
{
=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c 2008-12-09 08:30:49 +0000
+++ b/client/mysql_upgrade.c 2009-02-25 14:29:49 +0000
@@ -754,7 +754,7 @@ int main(int argc, char **argv)
if (init_dynamic_string(&ds_args, "", 512, 256))
die("Out of memory");
- load_defaults("my", load_default_groups, &argc, &argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
defaults_argv= argv; /* Must be freed by 'free_defaults' */
if (handle_options(&argc, &argv, my_long_options, get_one_option))
=== modified file 'client/mysqladmin.cc'
--- a/client/mysqladmin.cc 2009-01-08 19:03:56 +0000
+++ b/client/mysqladmin.cc 2009-02-25 14:29:49 +0000
@@ -301,7 +301,7 @@ int main(int argc,char *argv[])
MY_INIT(argv[0]);
mysql_init(&mysql);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
save_argv = argv; /* Save for free_defaults */
if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
{
=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc 2008-08-21 11:47:23 +0000
+++ b/client/mysqlbinlog.cc 2009-02-25 14:29:49 +0000
@@ -1289,7 +1289,7 @@ static int parse_args(int *argc, char***
int ho_error;
result_file = stdout;
- load_defaults("my",load_default_groups,argc,argv);
+ load_defaults("my", load_default_groups, argc, argv, NULL);
if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
exit(ho_error);
if (debug_info_flag)
=== modified file 'client/mysqlcheck.c'
--- a/client/mysqlcheck.c 2009-01-14 14:50:51 +0000
+++ b/client/mysqlcheck.c 2009-02-25 14:29:49 +0000
@@ -342,7 +342,7 @@ static int get_options(int *argc, char *
exit(0);
}
- load_defaults("my", load_default_groups, argc, argv);
+ load_defaults("my", load_default_groups, argc, argv, NULL);
if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
exit(ho_error);
=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c 2009-02-19 17:22:28 +0000
+++ b/client/mysqldump.c 2009-02-25 14:29:49 +0000
@@ -856,7 +856,7 @@ static int get_options(int *argc, char *
opt_net_buffer_length= *mysql_params->p_net_buffer_length;
md_result_file= stdout;
- load_defaults("my",load_default_groups,argc,argv);
+ load_defaults("my", load_default_groups, argc, argv, NULL);
defaults_argv= *argv;
if (hash_init(&ignore_table, charset_info, 16, 0, 0,
=== modified file 'client/mysqlimport.c'
--- a/client/mysqlimport.c 2008-11-14 16:29:38 +0000
+++ b/client/mysqlimport.c 2009-02-25 14:29:49 +0000
@@ -583,7 +583,7 @@ int main(int argc, char **argv)
char **argv_to_free;
MY_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
/* argv is changed in the program */
argv_to_free= argv;
if (get_options(&argc, &argv))
=== modified file 'client/mysqlshow.c'
--- a/client/mysqlshow.c 2008-11-14 16:29:38 +0000
+++ b/client/mysqlshow.c 2009-02-25 14:29:49 +0000
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
char *wild;
MYSQL mysql;
MY_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
get_options(&argc,&argv);
wild=0;
=== modified file 'client/mysqlslap.c'
--- a/client/mysqlslap.c 2008-11-25 02:04:58 +0000
+++ b/client/mysqlslap.c 2009-02-25 14:29:49 +0000
@@ -299,7 +299,7 @@ int main(int argc, char **argv)
MY_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
defaults_argv=argv;
if (get_options(&argc,&argv))
{
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc 2009-02-13 15:27:33 +0000
+++ b/client/mysqltest.cc 2009-02-25 14:29:49 +0000
@@ -5848,7 +5848,7 @@ get_one_option(int optid, const struct m
int parse_args(int argc, char **argv)
{
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
default_argv= argv;
if ((handle_options(&argc, &argv, my_long_options, get_one_option)))
=== modified file 'extra/my_print_defaults.c'
--- a/extra/my_print_defaults.c 2007-05-10 09:59:39 +0000
+++ b/extra/my_print_defaults.c 2009-02-25 14:29:49 +0000
@@ -176,7 +176,7 @@ int main(int argc, char **argv)
memcpy((char*) load_default_groups, (char*) argv, (argc + 1) * sizeof(*argv));
if ((error= load_defaults(config_file, (const char **) load_default_groups,
- &count, &arguments)))
+ &count, &arguments, NULL)))
{
if (verbose && opt_defaults_file_used)
{
=== modified file 'include/my_sys.h'
--- a/include/my_sys.h 2009-02-05 06:16:00 +0000
+++ b/include/my_sys.h 2009-02-25 14:29:49 +0000
@@ -843,13 +843,14 @@ extern int get_defaults_options(int argc
char **defaults, char **extra_defaults,
char **group_suffix);
extern int load_defaults(const char *conf_file, const char **groups,
- int *argc, char ***argv);
+ int *argc, char ***argv, const char ***);
extern int modify_defaults_file(const char *file_location, const char *option,
const char *option_value,
const char *section_name, int remove_option);
extern int my_search_option_files(const char *conf_file, int *argc,
char ***argv, uint *args_used,
- Process_option_func func, void *func_ctx);
+ Process_option_func func, void *func_ctx,
+ const char **default_directories);
extern void free_defaults(char **argv);
extern void my_print_default_files(const char *conf_file);
extern void print_defaults(const char *conf_file, const char **groups);
=== modified file 'mysys/default.c'
--- a/mysys/default.c 2008-07-22 11:33:37 +0000
+++ b/mysys/default.c 2009-02-25 14:29:49 +0000
@@ -49,7 +49,6 @@ char *my_defaults_extra_file=0;
#define MAX_DEFAULT_DIRS 6
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
-static const char **default_directories = NULL;
#ifdef __WIN__
static const char *f_extensions[]= { ".ini", ".cnf", 0 };
@@ -151,7 +150,7 @@ static char *remove_end_comment(char *pt
int my_search_option_files(const char *conf_file, int *argc, char ***argv,
uint *args_used, Process_option_func func,
- void *func_ctx)
+ void *func_ctx, const char **default_directories)
{
const char **dirs, *forced_default_file, *forced_extra_defaults;
int error= 0;
@@ -386,13 +385,18 @@ int get_defaults_options(int argc, char
that was put in *argv
RETURN
- 0 ok
- 1 The given conf_file didn't exists
+ - If successful, 0 is returned. If 'default_directories' is not NULL,
+ a pointer to the array of default directory paths is stored to a location
+ it points to. That stored value must be passed to my_search_option_files()
+ later.
+
+ - 1 is returned if the given conf_file didn't exist. In this case, the
+ value pointed to by default_directories is undefined.
*/
int load_defaults(const char *conf_file, const char **groups,
- int *argc, char ***argv)
+ int *argc, char ***argv, const char ***default_directories)
{
DYNAMIC_ARRAY args;
TYPELIB group;
@@ -402,10 +406,11 @@ int load_defaults(const char *conf_file,
MEM_ROOT alloc;
char *ptr,**res;
struct handle_option_ctx ctx;
+ const char **dirs;
DBUG_ENTER("load_defaults");
init_alloc_root(&alloc,512,0);
- if ((default_directories= init_default_directories(&alloc)) == NULL)
+ if ((dirs= init_default_directories(&alloc)) == NULL)
goto err;
/*
Check if the user doesn't want any default option processing
@@ -426,6 +431,8 @@ int load_defaults(const char *conf_file,
(*argc)--;
*argv=res;
*(MEM_ROOT*) ptr= alloc; /* Save alloc root for free */
+ if (default_directories)
+ *default_directories= dirs;
DBUG_RETURN(0);
}
@@ -444,7 +451,8 @@ int load_defaults(const char *conf_file,
ctx.group= &group;
error= my_search_option_files(conf_file, argc, argv, &args_used,
- handle_default_option, (void *) &ctx);
+ handle_default_option, (void *) &ctx,
+ dirs);
/*
Here error contains <> 0 only if we have a fully specified conf_file
or a forced default file
@@ -490,6 +498,10 @@ int load_defaults(const char *conf_file,
puts("");
exit(0);
}
+
+ if (error == 0 && default_directories)
+ *default_directories= dirs;
+
DBUG_RETURN(error);
err:
@@ -895,15 +907,11 @@ void my_print_default_files(const char *
fputs(conf_file,stdout);
else
{
- /*
- If default_directories is already initialized, use it. Otherwise,
- use a private MEM_ROOT.
- */
- const char **dirs = default_directories;
+ const char **dirs;
MEM_ROOT alloc;
init_alloc_root(&alloc,512,0);
- if (!dirs && (dirs= init_default_directories(&alloc)) == NULL)
+ if ((dirs= init_default_directories(&alloc)) == NULL)
{
fputs("Internal error initializing default directories list", stdout);
}
=== modified file 'server-tools/instance-manager/instance_map.cc'
--- a/server-tools/instance-manager/instance_map.cc 2007-05-10 09:59:39 +0000
+++ b/server-tools/instance-manager/instance_map.cc 2009-02-25 14:29:49 +0000
@@ -536,7 +536,8 @@ int Instance_map::load()
*/
if (my_search_option_files(Options::Main::config_file, &argc,
(char ***) &argv, &args_used,
- process_option, (void*) this))
+ process_option, (void*) this,
+ Options::default_directories))
log_info("Falling back to compiled-in defaults.");
return complete_initialization();
=== modified file 'server-tools/instance-manager/options.cc'
--- a/server-tools/instance-manager/options.cc 2007-05-10 09:59:39 +0000
+++ b/server-tools/instance-manager/options.cc 2009-02-25 14:29:49 +0000
@@ -86,6 +86,7 @@ const char *Options::Main::bind_address=
uint Options::Main::monitoring_interval= DEFAULT_MONITORING_INTERVAL;
uint Options::Main::port_number= DEFAULT_PORT;
my_bool Options::Main::mysqld_safe_compatible= FALSE;
+const char **Options::default_directories= NULL;
/* Options::User_management */
@@ -439,7 +440,8 @@ int Options::load(int argc, char **argv)
log_info("Loading config file '%s'...",
(const char *) Main::config_file);
- load_defaults(Main::config_file, default_groups, &argc, &saved_argv);
+ load_defaults(Main::config_file, default_groups, &argc,
+ &saved_argv, &default_directories);
if ((handle_options(&argc, &saved_argv, my_long_options, get_one_option)))
return ERR_INVALID_USAGE;
=== modified file 'server-tools/instance-manager/options.h'
--- a/server-tools/instance-manager/options.h 2007-01-27 01:46:45 +0000
+++ b/server-tools/instance-manager/options.h 2009-02-25 14:29:49 +0000
@@ -91,6 +91,9 @@ struct Options
#endif
public:
+ /* Array of paths to be passed to my_search_option_files() later */
+ static const char **default_directories;
+
static int load(int argc, char **argv);
static void cleanup();
=== modified file 'sql-common/client.c'
--- a/sql-common/client.c 2008-03-29 08:02:54 +0000
+++ b/sql-common/client.c 2009-02-25 14:29:49 +0000
@@ -1021,7 +1021,7 @@ void mysql_read_default_options(struct s
argc=1; argv=argv_buff; argv_buff[0]= (char*) "client";
groups[0]= (char*) "client"; groups[1]= (char*) group; groups[2]=0;
- load_defaults(filename, groups, &argc, &argv);
+ load_defaults(filename, groups, &argc, &argv, NULL);
if (argc != 1) /* If some default option */
{
char **option=argv;
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2009-02-23 12:42:31 +0000
+++ b/sql/mysqld.cc 2009-02-25 14:29:49 +0000
@@ -3223,7 +3223,7 @@ static int init_common_variables(const c
SQLCOM_END + 8);
#endif
- load_defaults(conf_file_name, groups, &argc, &argv);
+ load_defaults(conf_file_name, groups, &argc, &argv, NULL);
defaults_argv=argv;
defaults_argc=argc;
get_options(&defaults_argc, defaults_argv);
=== modified file 'storage/archive/archive_reader.c'
--- a/storage/archive/archive_reader.c 2008-11-25 02:04:58 +0000
+++ b/storage/archive/archive_reader.c 2009-02-25 14:29:49 +0000
@@ -390,7 +390,7 @@ static void print_version(void)
static void get_options(int *argc, char ***argv)
{
- load_defaults("my", load_default_groups, argc, argv);
+ load_defaults("my", load_default_groups, argc, argv, NULL);
default_argv= *argv;
handle_options(argc, argv, my_long_options, get_one_option);
=== modified file 'storage/myisam/myisamchk.c'
--- a/storage/myisam/myisamchk.c 2009-01-15 18:11:25 +0000
+++ b/storage/myisam/myisamchk.c 2009-02-25 14:29:49 +0000
@@ -739,7 +739,7 @@ static void get_options(register int *ar
{
int ho_error;
- load_defaults("my", load_default_groups, argc, argv);
+ load_defaults("my", load_default_groups, argc, argv, NULL);
default_argv= *argv;
if (isatty(fileno(stdout)))
check_param.testflag|=T_WRITE_LOOP;
=== modified file 'storage/myisam/myisampack.c'
--- a/storage/myisam/myisampack.c 2008-11-14 16:29:38 +0000
+++ b/storage/myisam/myisampack.c 2009-02-25 14:29:49 +0000
@@ -208,7 +208,7 @@ int main(int argc, char **argv)
char **default_argv;
MY_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
default_argv= argv;
get_options(&argc,&argv);
=== modified file 'storage/ndb/src/cw/cpcd/main.cpp'
--- a/storage/ndb/src/cw/cpcd/main.cpp 2007-05-10 09:59:39 +0000
+++ b/storage/ndb/src/cw/cpcd/main.cpp 2009-02-25 14:29:49 +0000
@@ -77,7 +77,7 @@ int main(int argc, char** argv){
const char *load_default_groups[]= { "ndb_cpcd",0 };
MY_INIT(argv[0]);
- load_defaults("ndb_cpcd",load_default_groups,&argc,&argv);
+ load_defaults("ndb_cpcd", load_default_groups, &argc, &argv, NULL);
if (handle_options(&argc, &argv, my_long_options, get_one_option)) {
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
puts("");
=== modified file 'storage/ndb/src/kernel/vm/Configuration.cpp'
--- a/storage/ndb/src/kernel/vm/Configuration.cpp 2007-06-06 14:51:04 +0000
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp 2009-02-25 14:29:49 +0000
@@ -123,7 +123,7 @@ static void usage()
bool
Configuration::init(int argc, char** argv)
{
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
int ho_error;
#ifndef DBUG_OFF
=== modified file 'storage/ndb/src/mgmclient/main.cpp'
--- a/storage/ndb/src/mgmclient/main.cpp 2007-06-17 15:21:27 +0000
+++ b/storage/ndb/src/mgmclient/main.cpp 2009-02-25 14:29:49 +0000
@@ -131,7 +131,7 @@ read_and_execute(int _try_reconnect)
int main(int argc, char** argv){
NDB_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
int ho_error;
#ifndef DBUG_OFF
opt_debug= "d:t:O,/tmp/ndb_mgm.trace";
=== modified file 'storage/ndb/src/mgmsrv/InitConfigFileParser.cpp'
--- a/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp 2007-05-24 10:24:36 +0000
+++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp 2009-02-25 14:29:49 +0000
@@ -726,7 +726,7 @@ load_defaults(Vector<struct my_option>&
}
char ** tmp = (char**)argv;
- int ret = load_defaults("my", groups, &argc, &tmp);
+ int ret = load_defaults("my", groups, &argc, &tmp, NULL);
my_defaults_file = save_file;
my_defaults_extra_file = save_extra_file;
=== modified file 'storage/ndb/src/mgmsrv/main.cpp'
--- a/storage/ndb/src/mgmsrv/main.cpp 2007-05-10 09:59:39 +0000
+++ b/storage/ndb/src/mgmsrv/main.cpp 2009-02-25 14:29:49 +0000
@@ -191,7 +191,7 @@ int main(int argc, char** argv)
NDB_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
int ho_error;
#ifndef DBUG_OFF
=== modified file 'storage/ndb/tools/delete_all.cpp'
--- a/storage/ndb/tools/delete_all.cpp 2007-05-10 09:59:39 +0000
+++ b/storage/ndb/tools/delete_all.cpp 2009-02-25 14:29:49 +0000
@@ -65,7 +65,7 @@ static void usage()
int main(int argc, char** argv){
NDB_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
int ho_error;
#ifndef DBUG_OFF
opt_debug= "d:t:O,/tmp/ndb_delete_all.trace";
=== modified file 'storage/ndb/tools/desc.cpp'
--- a/storage/ndb/tools/desc.cpp 2007-05-10 09:59:39 +0000
+++ b/storage/ndb/tools/desc.cpp 2009-02-25 14:29:49 +0000
@@ -71,7 +71,7 @@ static void print_part_info(Ndb* pNdb, N
int main(int argc, char** argv){
NDB_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
int ho_error;
#ifndef DBUG_OFF
opt_debug= "d:t:O,/tmp/ndb_desc.trace";
=== modified file 'storage/ndb/tools/drop_index.cpp'
--- a/storage/ndb/tools/drop_index.cpp 2007-05-10 09:59:39 +0000
+++ b/storage/ndb/tools/drop_index.cpp 2009-02-25 14:29:49 +0000
@@ -50,7 +50,7 @@ static void usage()
int main(int argc, char** argv){
NDB_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
int ho_error;
if ((ho_error=handle_options(&argc, &argv, my_long_options,
ndb_std_get_one_option)))
=== modified file 'storage/ndb/tools/drop_tab.cpp'
--- a/storage/ndb/tools/drop_tab.cpp 2007-05-10 09:59:39 +0000
+++ b/storage/ndb/tools/drop_tab.cpp 2009-02-25 14:29:49 +0000
@@ -50,7 +50,7 @@ static void usage()
int main(int argc, char** argv){
NDB_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
int ho_error;
if ((ho_error=handle_options(&argc, &argv, my_long_options,
ndb_std_get_one_option)))
=== modified file 'storage/ndb/tools/listTables.cpp'
--- a/storage/ndb/tools/listTables.cpp 2007-05-10 09:59:39 +0000
+++ b/storage/ndb/tools/listTables.cpp 2009-02-25 14:29:49 +0000
@@ -296,7 +296,7 @@ static void usage()
int main(int argc, char** argv){
NDB_INIT(argv[0]);
const char* _tabname;
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
int ho_error;
#ifndef DBUG_OFF
opt_debug= "d:t:O,/tmp/ndb_show_tables.trace";
=== modified file 'storage/ndb/tools/ndb_config.cpp'
--- a/storage/ndb/tools/ndb_config.cpp 2007-05-10 09:59:39 +0000
+++ b/storage/ndb/tools/ndb_config.cpp 2009-02-25 14:29:49 +0000
@@ -154,7 +154,7 @@ static ndb_mgm_configuration* load_confi
int
main(int argc, char** argv){
NDB_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
int ho_error;
if ((ho_error=handle_options(&argc, &argv, my_long_options,
ndb_std_get_one_option)))
=== modified file 'storage/ndb/tools/restore/restore_main.cpp'
--- a/storage/ndb/tools/restore/restore_main.cpp 2007-08-30 08:17:32 +0000
+++ b/storage/ndb/tools/restore/restore_main.cpp 2009-02-25 14:29:49 +0000
@@ -375,7 +375,7 @@ readArguments(int *pargc, char*** pargv)
const char *load_default_groups[]= { "mysql_cluster","ndb_restore",0 };
init_nodegroup_map();
- load_defaults("my",load_default_groups,pargc,pargv);
+ load_defaults("my", load_default_groups, pargc, pargv, NULL);
debug << "handle_options" << endl;
if (handle_options(pargc, pargv, my_long_options, get_one_option))
{
=== modified file 'storage/ndb/tools/select_all.cpp'
--- a/storage/ndb/tools/select_all.cpp 2007-05-10 09:59:39 +0000
+++ b/storage/ndb/tools/select_all.cpp 2009-02-25 14:29:49 +0000
@@ -114,7 +114,7 @@ static void usage()
int main(int argc, char** argv){
NDB_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
const char* _tabname;
int ho_error;
#ifndef DBUG_OFF
=== modified file 'storage/ndb/tools/select_count.cpp'
--- a/storage/ndb/tools/select_count.cpp 2007-05-10 09:59:39 +0000
+++ b/storage/ndb/tools/select_count.cpp 2009-02-25 14:29:49 +0000
@@ -69,7 +69,7 @@ static void usage()
int main(int argc, char** argv){
NDB_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
int ho_error;
#ifndef DBUG_OFF
opt_debug= "d:t:O,/tmp/ndb_select_count.trace";
=== modified file 'storage/ndb/tools/waiter.cpp'
--- a/storage/ndb/tools/waiter.cpp 2008-02-22 15:14:27 +0000
+++ b/storage/ndb/tools/waiter.cpp 2009-02-25 14:29:49 +0000
@@ -72,7 +72,7 @@ static void usage()
int main(int argc, char** argv){
NDB_INIT(argv[0]);
- load_defaults("my",load_default_groups,&argc,&argv);
+ load_defaults("my", load_default_groups, &argc, &argv, NULL);
const char* _hostName = NULL;
#ifndef DBUG_OFF
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c 2009-02-19 08:56:16 +0000
+++ b/tests/mysql_client_test.c 2009-02-25 14:29:49 +0000
@@ -18264,7 +18264,7 @@ int main(int argc, char **argv)
MY_INIT(argv[0]);
- load_defaults("my", client_test_load_default_groups, &argc, &argv);
+ load_defaults("my", client_test_load_default_groups, &argc, &argv, NULL);
defaults_argv= argv;
get_options(&argc, &argv);
