Merge with global tree

BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
libmysql/errmsg.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.h:
  Auto merged

4 files changed, 15 insertions, 12 deletions

diff --git a/include/errmsg.h b/include/errmsg.h
index 55bbdf6d767..ae3b04b4f3a 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -94,6 +94,7 @@ extern const char *client_errors[];	/* Error messages */
 #define CR_SECURE_AUTH                          2049
 #define CR_FETCH_CANCELED                       2050
 #define CR_NO_DATA                              2051
-#define CR_ERROR_LAST  /*Copy last error nr:*/  2051
+#define CR_NO_STMT_METADATA                     2052
+#define CR_ERROR_LAST  /*Copy last error nr:*/  2052
 /* Add error numbers before CR_ERROR_LAST and change it accordingly. */
 
diff --git a/include/my_base.h b/include/my_base.h
index dd1c56eb8bb..1713a07f6ec 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -311,7 +311,8 @@ enum ha_base_keytype {
 #define HA_ERR_NO_SUCH_TABLE     155  /* The table does not exist in engine */
 #define HA_ERR_TABLE_EXIST       156  /* The table existed in storage engine */
 #define HA_ERR_NO_CONNECTION     157  /* Could not connect to storage engine */
-#define HA_ERR_LAST              157 /*Copy last error nr.*/
+#define HA_ERR_NULL_IN_SPATIAL   158  /* NULLs are not supported in spatial index */
+#define HA_ERR_LAST              158  /*Copy last error nr.*/
 /* Add error numbers before HA_ERR_LAST and change it accordingly. */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
 
diff --git a/include/my_handler.h b/include/my_handler.h
index 9ddc0c61eee..cad15d5471f 100644
--- a/include/my_handler.h
+++ b/include/my_handler.h
@@ -25,17 +25,17 @@
 
 typedef struct st_HA_KEYSEG		/* Key-portion */
 {
+  CHARSET_INFO *charset;
+  uint32 start;				/* Start of key in record */
+  uint32 null_pos;			/* position to NULL indicator */
+  uint16 bit_pos;                       /* Position to bit part */
+  uint16 flag;
+  uint16 length;			/* Keylength */
   uint8  type;				/* Type of key (for sort) */
   uint8  language;
   uint8  null_bit;			/* bitmask to test for NULL */
   uint8  bit_start,bit_end;		/* if bit field */
-  uint16 flag;
-  uint16 length;			/* Keylength */
-  uint32 start;				/* Start of key in record */
-  uint32 null_pos;			/* position to NULL indicator */
-  CHARSET_INFO *charset;
-  uint8 bit_length;                     /* Length of bit part */
-  uint16 bit_pos;                       /* Position to bit part */
+  uint8  bit_length;                    /* Length of bit part */
 } HA_KEYSEG;
 
 #define get_key_length(length,key) \
diff --git a/include/raid.h b/include/raid.h
index b5a5e665824..04c54393e54 100644
--- a/include/raid.h
+++ b/include/raid.h
@@ -32,9 +32,6 @@ C_MODE_END
 #endif
 #if defined(USE_RAID)
 
-#ifdef __GNUC__
-#pragma interface			/* gcc class implementation */
-#endif
 #include "my_dir.h"
 
 /* Trap all occurences of my_...() in source and use our wrapper around this function */
@@ -92,6 +89,10 @@ extern "C" {
 #ifdef __cplusplus
 }
 
+#ifdef __GNUC__
+#pragma interface			/* gcc class implementation */
+#endif
+
 class RaidName {
   public:
     RaidName(const char *FileName);