Merge bk://localhost:5556

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50

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 */
 

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