diff options
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 2 | ||||
| -rw-r--r-- | myisam/mi_open.c | 3 | ||||
| -rw-r--r-- | mysys/mf_tempfile.c | 2 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 1 |
5 files changed, 8 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 1842ac5d2fc..f4566e3c5fa 100644 --- a/configure.in +++ b/configure.in @@ -1201,7 +1201,8 @@ AC_SUBST(MAKE_SHELL) # Already-done: stdlib.h string.h unistd.h termios.h AC_CHECK_HEADERS(varargs.h stdarg.h dirent.h locale.h ndir.h sys/dir.h \ sys/file.h sys/ndir.h sys/ptem.h sys/pte.h sys/select.h sys/stream.h \ - sys/mman.h curses.h termcap.h termio.h termbits.h asm/termbits.h grp.h) + sys/mman.h curses.h termcap.h termio.h termbits.h asm/termbits.h grp.h \ +paths.h) # Already-done: strcasecmp AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr) diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 50e7cd95dc3..5263baa1e84 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -45,7 +45,7 @@ mystringsextra= strto.c ctype_autoconf.c dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo mysysheaders = mysys_priv.h my_static.h mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ - my_create.lo my_delete.lo my_tempnam.lo my_open.lo \ + my_create.lo my_delete.lo mf_tempfile.lo my_open.lo \ mf_casecnv.lo my_read.lo my_write.lo errors.lo \ my_error.lo my_getwd.lo my_div.lo \ mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo\ diff --git a/myisam/mi_open.c b/myisam/mi_open.c index f962d0485c8..cb19011fea7 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -178,6 +178,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) ((share->state.changed & STATE_CRASHED) || (my_disable_locking && share->state.open_count))) { + DBUG_PRINT("error",("Table is marked as crashed")); my_errno=((share->state.changed & STATE_CRASHED_ON_REPAIR) ? HA_ERR_CRASHED_ON_REPAIR : HA_ERR_CRASHED); goto err; @@ -209,6 +210,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) #elif !defined(USE_RAID) if (share->base.raid_type) { + DBUG_PRINT("error",("Table uses RAID but we don't have RAID support")); my_errno=HA_ERR_UNSUPPORTED; goto err; } @@ -219,6 +221,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) if (share->base.max_key_length > MI_MAX_KEY_BUFF || keys > MI_MAX_KEY || key_parts >= MI_MAX_KEY * MI_MAX_KEY_SEG) { + DBUG_PRINT("error",("Wrong key info: Max_key_length: %d keys: %d key_parts: %d", share->base.max_key_length, keys, key_parts)); my_errno=HA_ERR_UNSUPPORTED; goto err; } diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c index a202dd13d8b..8370c6e7ec8 100644 --- a/mysys/mf_tempfile.c +++ b/mysys/mf_tempfile.c @@ -20,7 +20,7 @@ #include "my_static.h" #include "mysys_err.h" #include <errno.h> -#ifdef HAVE_PATH_H +#ifdef HAVE_PATHS_H #include <paths.h> #endif diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 011638afc93..ad3b03ca238 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -21,6 +21,7 @@ #include "sql_repl.h" #include "sql_acl.h" #include "log_event.h" +#include <thr_alarm.h> #include <my_dir.h> extern const char* any_db; |