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 /mysys/errors.c | |
| 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 'mysys/errors.c')
| -rw-r--r-- | mysys/errors.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/errors.c b/mysys/errors.c index 630e4511124..5fe9eadb522 100644 --- a/mysys/errors.c +++ b/mysys/errors.c @@ -50,6 +50,7 @@ const char * NEAR globerrs[GLOBERRS]= "Can't sync file '%s' to disk (Errcode: %d)", "Collation '%s' is not a compiled collation and is not specified in the '%s' file", "File '%s' not found (Errcode: %d)", + "File '%s' (fileno: %d) was not closed" }; void init_glob_errs(void) @@ -89,5 +90,6 @@ void init_glob_errs() EE(EE_SYNC)= "Can't sync file '%s' to disk (Errcode: %d)"; EE(EE_UNKNOWN_COLLATION)= "Collation '%s' is not a compiled collation and is not specified in the %s file"; EE(EE_FILENOTFOUND) = "File '%s' not found (Errcode: %d)"; + EE(EE_FILE_NOT_CLOSED) = "File '%s' (fileno: %d) was not closed"; } #endif |