diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-01-23 02:43:57 +0100 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-01-23 02:43:57 +0100 |
| commit | ed25e71db2b8a34fb96a641f001c819cbd4961ab (patch) | |
| tree | 71f79686491124c0e3d203f1caf2ed0d5e713bce | |
| parent | 0e8d29031e9fccfd5df70684b3b0f32129f17045 (diff) | |
| parent | 49b814e5f541e2e7e7eabfacf073f9c0fb5fa980 (diff) | |
| download | mariadb-git-ed25e71db2b8a34fb96a641f001c819cbd4961ab.tar.gz | |
Merge bk://localhost:5556
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
mysql-test/r/range.result:
Auto merged
sql/item.cc:
Auto merged
| -rw-r--r-- | innobase/dict/dict0dict.c | 2 | ||||
| -rw-r--r-- | sql/ha_innodb.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c index ba03e1f5e41..df48a8a4b5a 100644 --- a/innobase/dict/dict0dict.c +++ b/innobase/dict/dict0dict.c @@ -28,7 +28,7 @@ Created 1/8/1996 Heikki Tuuri #include "rem0cmp.h" /* Implement isspace() in a locale-independent way. (Bug #24299) */ -#define ib_isspace(c) strchr(" \v\f\t\r\n", c) +#define ib_isspace(c) ((char) (c) && strchr(" \v\f\t\r\n", c)) dict_sys_t* dict_sys = NULL; /* the dictionary system */ diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index fd0f1ff2a4f..9d18e22cc77 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -215,7 +215,7 @@ extern my_bool innobase_log_archive, innobase_use_large_pages, innobase_use_native_aio, innobase_file_per_table, innobase_locks_unsafe_for_binlog, - innobase_rollback_on_timeout, + innobase_rollback_on_timeout, innobase_create_status_file; extern my_bool innobase_very_fast_shutdown; /* set this to 1 just before calling innobase_end() if you want |