Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl1280-part1

BitKeeper/etc/logging_ok

@@ -5,6 +5,7 @@ Administrator@fred.
 Miguel@light.local
 Sinisa@sinisa.nasamreza.org
 WAX@sergbook.mysql.com
+acurtis@pcgem.rdg.cyberkinetica.com
 administrador@light.hegel.local
 ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
 akishkin@work.mysql.com

sql/handler.cc

@@ -70,6 +70,37 @@ const char *tx_isolation_names[] =
 TYPELIB tx_isolation_typelib= {array_elements(tx_isolation_names)-1,"",
 			       tx_isolation_names};
 
+enum db_type ha_resolve_by_name(char *name, uint namelen)
+{
+  enum db_type result = DB_TYPE_UNKNOWN;
+  if (!my_strcasecmp(&my_charset_latin1, name, "HEAP") ||
+      !my_strcasecmp(&my_charset_latin1, name, "MEMORY")) {
+    result = DB_TYPE_HEAP;
+  } else
+  if (!my_strcasecmp(&my_charset_latin1, name, "MRG_MYISAM") ||
+      !my_strcasecmp(&my_charset_latin1, name, "MERGE")) {
+    result = DB_TYPE_MRG_MYISAM;
+  } else
+  if (!my_strcasecmp(&my_charset_latin1, name, "MYISAM")) {
+    result = DB_TYPE_MYISAM;
+  } else
+  if (!my_strcasecmp(&my_charset_latin1, name, "BDB") ||
+      !my_strcasecmp(&my_charset_latin1, name, "BERKELEYDB")) {
+    result = DB_TYPE_BERKELEY_DB;
+  } else
+  if (!my_strcasecmp(&my_charset_latin1, name, "INNODB") ||
+      !my_strcasecmp(&my_charset_latin1, name, "INNOBASE")) {
+    result = DB_TYPE_INNODB;
+  } else
+  if (!my_strcasecmp(&my_charset_latin1, name, "ISAM")) {
+    result = DB_TYPE_ISAM;
+  } else
+  if (!my_strcasecmp(&my_charset_latin1, name, "DEFAULT")) {
+    result = (enum db_type) current_thd->variables.table_type;
+  }
+  return result;
+}
+
 	/* Use other database handler if databasehandler is not incompiled */
 
 enum db_type ha_checktype(enum db_type database_type)
@@ -77,18 +108,21 @@ enum db_type ha_checktype(enum db_type database_type)
   switch (database_type) {
 #ifdef HAVE_BERKELEY_DB
   case DB_TYPE_BERKELEY_DB:
-    return(berkeley_skip ? DB_TYPE_MYISAM : database_type);
+    if (berkeley_skip) break;
+    return (database_type);
 #endif
 #ifdef HAVE_INNOBASE_DB
   case DB_TYPE_INNODB:
-    return(innodb_skip ? DB_TYPE_MYISAM : database_type);
+    if (innodb_skip) break;
+    return (database_type);
 #endif
 #ifndef NO_HASH
   case DB_TYPE_HASH:
 #endif
 #ifdef HAVE_ISAM
   case DB_TYPE_ISAM:
-    return (isam_skip ? DB_TYPE_MYISAM : database_type);
+    if (isam_skip) break;
+    return (database_type);
   case DB_TYPE_MRG_ISAM:
     return (isam_skip ? DB_TYPE_MRG_MYISAM : database_type);
 #else
@@ -102,7 +136,8 @@ enum db_type ha_checktype(enum db_type database_type)
   default:
     break;
   }
-  return(DB_TYPE_MYISAM);			/* Use this as default */
+  /* Use this as default */
+  return((enum db_type) current_thd->variables.table_type);
 } /* ha_checktype */
 
 

sql/handler.h

@@ -379,6 +379,7 @@ extern TYPELIB ha_table_typelib, tx_isolation_typelib;
 
 #define ha_supports_generate(T) (T != DB_TYPE_INNODB)
 
+enum db_type ha_resolve_by_name(char *name, uint namelen);
 handler *get_new_handler(TABLE *table, enum db_type db_type);
 my_off_t ha_get_ptr(byte *ptr, uint pack_length);
 void ha_store_ptr(byte *buff, uint pack_length, my_off_t pos);

sql/lex.h

@@ -196,7 +196,6 @@ static SYMBOL symbols[] = {
   { "HAVING",		SYM(HAVING),0,0},
   { "HANDLER",		SYM(HANDLER_SYM),0,0},
   { "HASH",		SYM(HASH_SYM),0,0},
-  { "HEAP",		SYM(HEAP_SYM),0,0},
   { "HELP",		SYM(HELP_SYM),0,0},
   { "HIGH_PRIORITY",	SYM(HIGH_PRIORITY),0,0},
   { "HOUR",		SYM(HOUR_SYM),0,0},
@@ -231,7 +230,6 @@ static SYMBOL symbols[] = {
   { "IF",		SYM(IF),0,0},
   { "IS",		SYM(IS),0,0},
   { "ISOLATION",	SYM(ISOLATION),0,0},
-  { "ISAM",		SYM(ISAM_SYM),0,0},
   { "ISSUER",		SYM(ISSUER_SYM),0,0},
   { "ITERATE",		SYM(ITERATE_SYM),0,0},
   { "JOIN",		SYM(JOIN_SYM),0,0},
@@ -283,9 +281,7 @@ static SYMBOL symbols[] = {
   { "MEDIUMBLOB",	SYM(MEDIUMBLOB),0,0},
   { "MEDIUMTEXT",	SYM(MEDIUMTEXT),0,0},
   { "MEDIUMINT",	SYM(MEDIUMINT),0,0},
-  { "MERGE",		SYM(MERGE_SYM),0,0},
   { "MEDIUM",		SYM(MEDIUM_SYM),0,0},
-  { "MEMORY",		SYM(MEMORY_SYM),0,0},
   { "MICROSECOND",	SYM(MICROSECOND_SYM),0,0},
   { "MIDDLEINT",	SYM(MEDIUMINT),0,0},	/* For powerbuilder */
   { "MIN_ROWS",		SYM(MIN_ROWS),0,0},
@@ -299,8 +295,6 @@ static SYMBOL symbols[] = {
   { "MULTILINESTRING",	SYM(MULTILINESTRING),0,0},
   { "MULTIPOINT",	SYM(MULTIPOINT),0,0},
   { "MULTIPOLYGON",	SYM(MULTIPOLYGON),0,0},
-  { "MRG_MYISAM",	SYM(MERGE_SYM),0,0},
-  { "MYISAM",		SYM(MYISAM_SYM),0,0},
   { "NAMES",		SYM(NAMES_SYM),0,0},
   { "NATURAL",		SYM(NATURAL),0,0},
   { "NATIONAL",		SYM(NATIONAL_SYM),0,0},

sql/sql_yacc.yy

@@ -255,7 +255,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	GROUP
 %token	HAVING
 %token	HASH_SYM
-%token	HEAP_SYM
 %token	HEX_NUM
 %token	HIGH_PRIORITY
 %token	HOSTS_SYM
@@ -271,7 +270,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	INTO
 %token	IN_SYM
 %token	ISOLATION
-%token	ISAM_SYM
 %token	JOIN_SYM
 %token	KEYS
 %token	KEY_SYM
@@ -311,10 +309,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 %token	MAX_QUERIES_PER_HOUR
 %token	MAX_UPDATES_PER_HOUR
 %token	MEDIUM_SYM
-%token	MERGE_SYM
-%token	MEMORY_SYM
 %token	MIN_ROWS
-%token	MYISAM_SYM
 %token	NAMES_SYM
 %token	NATIONAL_SYM
 %token	NATURAL
@@ -1969,13 +1964,14 @@ create_table_option:
 	| INDEX DIRECTORY_SYM opt_equal TEXT_STRING_sys { Lex->create_info.index_file_name= $4.str; };
 
 table_types:
-	ISAM_SYM	{ $$= DB_TYPE_ISAM; }
-	| MYISAM_SYM	{ $$= DB_TYPE_MYISAM; }
-	| MERGE_SYM	{ $$= DB_TYPE_MRG_MYISAM; }
-	| HEAP_SYM	{ $$= DB_TYPE_HEAP; }
-	| MEMORY_SYM	{ $$= DB_TYPE_HEAP; }
-	| BERKELEY_DB_SYM { $$= DB_TYPE_BERKELEY_DB; }
-	| INNOBASE_SYM  { $$= DB_TYPE_INNODB; };
+	ident_or_text
+	{
+	  $$ = ha_resolve_by_name($1.str,$1.length);
+	  if ($$ == DB_TYPE_UNKNOWN) {
+	    net_printf(YYTHD, ER_UNKNOWN_TABLE, $1.str);
+	    YYABORT;
+	  }
+	};
 
 row_types:
 	DEFAULT		{ $$= ROW_TYPE_DEFAULT; }
@@ -5529,7 +5525,6 @@ keyword:
 	| GLOBAL_SYM		{}
 	| HANDLER_SYM		{}
 	| HASH_SYM		{}
-	| HEAP_SYM		{}
 	| HELP_SYM		{}
 	| HOSTS_SYM		{}
 	| HOUR_SYM		{}
@@ -5537,7 +5532,6 @@ keyword:
 	| IMPORT		{}
 	| INDEXES		{}
 	| ISOLATION		{}
-	| ISAM_SYM		{}
 	| ISSUER_SYM		{}
 	| INNOBASE_SYM		{}
 	| INSERT_METHOD		{}
@@ -5568,8 +5562,6 @@ keyword:
 	| MAX_QUERIES_PER_HOUR	{}
 	| MAX_UPDATES_PER_HOUR	{}
 	| MEDIUM_SYM		{}
-	| MERGE_SYM		{}
-	| MEMORY_SYM		{}
 	| MICROSECOND_SYM	{}
 	| MINUTE_SYM		{}
 	| MIN_ROWS		{}
@@ -5579,7 +5571,6 @@ keyword:
 	| MULTILINESTRING	{}
 	| MULTIPOINT		{}
 	| MULTIPOLYGON		{}
-	| MYISAM_SYM		{}
 	| NAMES_SYM		{}
 	| NATIONAL_SYM		{}
 	| NCHAR_SYM		{}