bk commit into 5.0 tree (tsmith:1.2383)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-21 17:58:02-07:00, tsmith@stripped +2 -0
  Applied innodb-5.0-ss1230 snapshot

  innobase/dict/dict0dict.c@stripped, 2007-01-21 17:58:00-07:00, tsmith@stripped +1 -1
    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@stripped, 2007-01-21 17:58:00-07:00, tsmith@stripped +1 -1
    Applied innodb-5.0-ss1230
    
    Trivial indent SPACES -> TAB change.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	siva.hindu.god
# Root:	/home/tsmith/m/inno/jan20/50

--- 1.80/innobase/dict/dict0dict.c	2007-01-15 04:13:06 -07:00
+++ 1.81/innobase/dict/dict0dict.c	2007-01-21 17:58:00 -07:00
@@ -28,7 +28,7 @@
 #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 */
 

--- 1.115/sql/ha_innodb.h	2006-12-23 12:04:24 -07:00
+++ 1.116/sql/ha_innodb.h	2007-01-21 17:58:00 -07:00
@@ -215,7 +215,7 @@
                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