Commit ed25e71d authored by unknown's avatar unknown
Browse files

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
parents 0e8d2903 49b814e5

innobase/dict/dict0dict.c

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1

File changed.

Contains only whitespace changes.