diff options
| author | unknown <monty@mysql.com> | 2006-05-04 06:28:24 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-05-04 06:28:24 +0300 |
| commit | 79d87430db7aac8e9b763d63a2e51cc9946bdc8d (patch) | |
| tree | f9bdf22894017186b47db65bd16339e2f5b9646a /mysql-test/r/ndb_config.result | |
| parent | 26fe4bf90b1a5ad3056a095e7950e0965af3eb5c (diff) | |
| download | mariadb-git-79d87430db7aac8e9b763d63a2e51cc9946bdc8d.tar.gz | |
After merge fixes
Remove compiler warnings
Fix some broken tests
Workaround for syncronization bug in NDB (Bug #16445)
client/mysqltest.c:
Added more information to output from abort_not_supported_test()
Removed compiler warnings
include/my_sys.h:
Added function to print names of open files
include/mysys_err.h:
Print names of open files
mysql-test/include/have_ndb.inc:
Added comment
mysql-test/lib/mtr_report.pl:
Only print warning once
mysql-test/r/mysqldump.result:
After merge fix
mysql-test/r/ndb_basic.result:
Workaround for syncronization bug in NDB
mysql-test/r/ndb_config.result:
Remove not portable test
mysql-test/t/ndb_basic.test:
Workaround for syncronization bug in NDB
mysql-test/t/ndb_config.test:
Remove not portable test
mysys/errors.c:
Print names of open files
mysys/my_file.c:
Ensure that structs are cleared and copyied properly so that my_print_open_files() works.
mysys/my_init.c:
In case of EXTRA_DEBUG, print names of open files
mysys/my_open.c:
Added function to print names of open files
sql/sql_table.cc:
Fixed file-not-closed error
Diffstat (limited to 'mysql-test/r/ndb_config.result')
| -rw-r--r-- | mysql-test/r/ndb_config.result | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_config.result b/mysql-test/r/ndb_config.result index d2a8a91828c..c364b8f1b5d 100644 --- a/mysql-test/r/ndb_config.result +++ b/mysql-test/r/ndb_config.result @@ -8,4 +8,3 @@ ndbd,1,localhost,52428800,26214400 ndbd,2,localhost,52428800,36700160 ndbd,3,loc ndbd,1,localhost ndbd,2,localhost ndbd,3,localhost ndbd,4,localhost ndb_mgmd,5,localhost mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10, ndbd,2,localhost ndbd,3,localhost ndbd,4,localhost ndbd,5,localhost ndb_mgmd,6,localhost mysqld,1, mysqld,7, mysqld,8, mysqld,9, mysqld,10, ndbd,3,localhost ndbd,4,localhost ndbd,5,localhost ndbd,6,localhost ndb_mgmd,1,localhost ndb_mgmd,2,localhost mysqld,11, mysqld,12, mysqld,13, mysqld,14, mysqld,15, -shm,3,4,35,3 shm,3,5,35,3 shm,3,6,35,3 shm,4,5,35,4 shm,4,6,35,4 shm,5,6,35,5 tcp,11,3,55,3 tcp,11,4,55,4 tcp,11,5,55,5 tcp,11,6,55,6 tcp,12,3,55,3 tcp,12,4,55,4 tcp,12,5,55,5 tcp,12,6,55,6 tcp,13,3,55,3 tcp,13,4,55,4 tcp,13,5,55,5 tcp,13,6,55,6 tcp,14,3,55,3 tcp,14,4,55,4 tcp,14,5,55,5 tcp,14,6,55,6 tcp,15,3,55,3 tcp,15,4,55,4 tcp,15,5,55,5 tcp,15,6,55,6 tcp,1,3,55,1 tcp,1,4,55,1 tcp,1,5,55,1 tcp,1,6,55,1 tcp,2,3,55,2 tcp,2,4,55,2 tcp,2,5,55,2 tcp,2,6,55,2 |