Commit 710a2e29 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Auto merged
parents 0a467b5f d3febe80

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ extern char wild_many,wild_one,wild_prefix; 
extern const char *charsets_dir;

extern char *defaults_extra_file;

extern const char *defaults_group_suffix;

extern const char *defaults_file;



extern my_bool timed_mutexes;

mysql-test/r/ndb_config.result

+2 −0
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysql 
1 localhost 41943040 12582912

2 localhost 41943040 12582912

1 2

ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7,

ndbd,1,localhost,52428800,26214400 ndbd,2,localhost,52428800,36700160 ndbd,3,localhost,52428800,52428800 ndbd,4,localhost,52428800,52428800 ndb_mgmd,5,localhost,, mysqld,6,localhost,,

mysql-test/std_data/ndb_config_mycnf1.cnf

0 → 100644
+15 −0
Original line number Diff line number Diff line 
[cluster_config]

NoOfReplicas=1

DataMemory=50M



[cluster_config.jonas]

IndexMemory=50M

ndbd = localhost,localhost,localhost,localhost

ndb_mgmd = localhost

mysqld = localhost



[cluster_config.ndbd.1]

DataMemory=25M



[cluster_config.ndbd.2.jonas]

DataMemory=35M

mysql-test/t/ndb_config.test

+3 −0
Original line number Diff line number Diff line
@@ -6,5 +6,8 @@ 
--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --no-defaults -r \\n -f " " --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --type=ndbd --host=localhost 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host --config-file=$NDB_BACKUP_DIR/config.ini 2> /dev/null



# End of 4.1 tests



--exec $NDB_TOOLS_DIR/ndb_config --defaults-group-suffix=.jonas --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf1.cnf --query=type,nodeid,host,IndexMemory,DataMemory --mycnf 2> /dev/null

mysys/default.c

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <winbase.h>

#endif



const char *defaults_file=0;

const char *defaults_group_suffix=0;

char *defaults_extra_file=0;
@@ -140,6 +141,9 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, 
  if (forced_extra_defaults)

    defaults_extra_file= (char *) forced_extra_defaults;

  

  if (forced_default_file)

    defaults_file= forced_default_file;



  /*

    We can only handle 'defaults-group-suffix' if we are called from

    load_defaults() as otherwise we can't know the type of 'func_ctx'