From b238db620b592383190c6eeed7479a4f21c2fe66 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 21 Jan 2007 17:58:02 -0700 Subject: [PATCH] Applied innodb-5.0-ss1230 snapshot Fixes: - Bug #25596: innobase/dict/dict0dict.c: Applied innodb-5.0-ss1230 snapshot. r1230 branches/5.0: ib_isspace(c): Check for c being the null character. (Bug #25596) sql/ha_innodb.h: Applied innodb-5.0-ss1230 Trivial indent SPACES -> TAB change. --- innobase/dict/dict0dict.c | 2 +- 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