Commit 281ca81e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into  mysql.com:/home/jonas/src/mysql-5.0
parents eaf98500 aab66123

mysql-test/r/ndb_config.result

0 → 100644
+5 −0
Original line number Diff line number Diff line 
ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3, mysqld,4, mysqld,5, mysqld,6, mysqld,7,

1,localhost,41943040,12582912 2,localhost,41943040,12582912

1 localhost 41943040 12582912

2 localhost 41943040 12582912

1 2

mysql-test/t/ndb_config.test

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host 2> /dev/null

--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