diff options
| author | jonas@perch.ndb.mysql.com <> | 2005-09-30 11:42:33 +0200 |
|---|---|---|
| committer | jonas@perch.ndb.mysql.com <> | 2005-09-30 11:42:33 +0200 |
| commit | 1e6f19074e7cac8db6e2c88630f897eb7e79a96f (patch) | |
| tree | c6bf58e8b5e639dba6a02f52ab18e26fb78f4d18 /mysql-test | |
| parent | 035673c32d5457784e901524afaf3485066d7ff7 (diff) | |
| parent | a30faa3b3488585e0e83443f8e02a3d54cb74b9f (diff) | |
| download | mariadb-git-1e6f19074e7cac8db6e2c88630f897eb7e79a96f.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ndb_config.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/ndb_config.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_config.result b/mysql-test/r/ndb_config.result index c2557f85c0b..d8e1dc2aad2 100644 --- a/mysql-test/r/ndb_config.result +++ b/mysql-test/r/ndb_config.result @@ -3,3 +3,4 @@ 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, mysqld,4, mysqld,5, mysqld,6, mysqld,7, diff --git a/mysql-test/t/ndb_config.test b/mysql-test/t/ndb_config.test index ab3063af672..2c919fbd70c 100644 --- a/mysql-test/t/ndb_config.test +++ b/mysql-test/t/ndb_config.test @@ -6,5 +6,6 @@ --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 |