bk commit into 5.0 tree (ingo:1.1982)

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev 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
  1.1982 05/12/07 19:47:55 ingo@stripped +2 -0
  Merge istruewing@stripped:/home/bk/mysql-5.0
  into  mysql.com:/home/mydev/mysql-5.0-bug10932

  sql/mysql_priv.h
    1.375 05/12/07 19:47:49 ingo@stripped +0 -0
    Auto merged

  configure.in
    1.370 05/12/07 19:47:48 ingo@stripped +0 -0
    Auto merged

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-bug10932/RESYNC

--- 1.369/configure.in	2005-12-06 08:19:15 +01:00
+++ 1.370/configure.in	2005-12-07 19:47:48 +01:00
@@ -7,7 +7,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.17)
+AM_INIT_AUTOMAKE(mysql, 5.0.18)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10

--- 1.374/sql/mysql_priv.h	2005-12-07 09:06:11 +01:00
+++ 1.375/sql/mysql_priv.h	2005-12-07 19:47:49 +01:00
@@ -664,6 +664,7 @@
 bool mysql_preload_keys(THD* thd, TABLE_LIST* table_list);
 int reassign_keycache_tables(THD* thd, KEY_CACHE *src_cache,
                              KEY_CACHE *dst_cache);
+TABLE *create_virtual_tmp_table(THD *thd, List<create_field> &field_list);
 
 bool mysql_xa_recover(THD *thd);
 
@@ -1103,8 +1104,8 @@
 uint check_word(TYPELIB *lib, const char *val, const char *end,
 		const char **end_of_word);
 
-bool is_keyword(const char *name, uint len);
 
+bool is_keyword(const char *name, uint len);
 
 #define MY_DB_OPT_FILE "db.opt"
 bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create);