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

into mysql.com:/home/jonas/src/mysql-5.0

Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
0345998f · joreland@mysql.com · 293145b3 · b285050e · 0345998f · 0345998f
Commit 0345998f authored Jul 24, 2005 by joreland@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

mysql-test/r/ndb_config.result mysql-test/r/ndb_config.result +5 -0

mysql-test/t/ndb_config.test mysql-test/t/ndb_config.test +4 -0

No files found.
--- a/mysql-test/r/ndb_config.result
+++ b/mysql-test/r/ndb_config.result
+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
--- a/mysql-test/t/ndb_config.test
+++ b/mysql-test/t/ndb_config.test
+--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