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

into  zim.(none):/home/brian/mysql/fix-5.0


sql/handler.cc:
  Auto merged

sql/handler.cc

@@ -119,12 +119,12 @@ struct show_table_type_st sys_table_types[]=
 
 struct show_table_alias_st sys_table_aliases[]=
 {
-  {"INNOBASE",	"InnoDB", NULL },
-  {"NDB", "NDBCLUSTER", NULL},
-  {"BDB", "BERKELEYDB", NULL},
-  {"HEAP", "MEMORY", NULL},
-  {"MERGE", "MRG_MYISAM", NULL},
-  {NullS, NullS, NULL}
+  {"INNOBASE",	"InnoDB"},
+  {"NDB", "NDBCLUSTER"},
+  {"BDB", "BERKELEYDB"},
+  {"HEAP", "MEMORY"},
+  {"MERGE", "MRG_MYISAM"},
+  {NullS, NullS}
 };
 
 const char *ha_row_type[] = {
@@ -145,28 +145,32 @@ enum db_type ha_resolve_by_name(const char *name, uint namelen)
   THD *thd= current_thd;
   show_table_alias_st *table_alias;
   show_table_type_st *types;
+  const char *ptr= name;
 
-  if (thd && !my_strcasecmp(&my_charset_latin1, name, "DEFAULT")) {
+  if (thd && !my_strcasecmp(&my_charset_latin1, ptr, "DEFAULT"))
     return (enum db_type) thd->variables.table_type;
-  }
 
+retest:
   for (types= sys_table_types; types->type; types++)
   {
-    if (!my_strcasecmp(&my_charset_latin1, name, types->type))
+    if (!my_strcasecmp(&my_charset_latin1, ptr, types->type))
       return (enum db_type) types->db_type;
   }
 
   /*
-    We check for the historical aliases next.
+    We check for the historical aliases.
   */
   for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
   {
-    if (!my_strcasecmp(&my_charset_latin1, name, table_alias->alias) && table_alias->st)
-      return (enum db_type) table_alias->st->db_type;
+    if (!my_strcasecmp(&my_charset_latin1, ptr, table_alias->alias))
+    {
+      ptr= table_alias->type;
+      goto retest;
+    }
   }
+
   return DB_TYPE_UNKNOWN;
 }
-
 const char *ha_get_storage_engine(enum db_type db_type)
 {
   show_table_type_st *types;
@@ -398,29 +402,20 @@ int ha_init()
   if (ha_init_errors())
     return 1;
 
+  /*
+    This will go away soon.
+  */
   for (types= sys_table_types; types->type; types++)
   {
     switch (types->db_type) {
     case DB_TYPE_HEAP:
       types->ht= &heap_hton;
-      for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
-      {
-        if (!my_strcasecmp(&my_charset_latin1, types->ht->name, 
-                           table_alias->type))
-          table_alias->st= types;
-      }
       break;
     case DB_TYPE_MYISAM:
       types->ht= &myisam_hton;
       break;
     case DB_TYPE_MRG_MYISAM:
       types->ht= &myisammrg_hton;
-      for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
-      {
-        if (!my_strcasecmp(&my_charset_latin1, types->ht->name, 
-                           table_alias->type))
-          table_alias->st= types;
-      }
       break;
 #ifdef HAVE_BERKELEY_DB
     case DB_TYPE_BERKELEY_DB:
@@ -434,11 +429,6 @@ int ha_init()
         else
         {
           types->ht= &berkeley_hton;
-          for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
-          {
-            if (!my_strcasecmp(&my_charset_latin1, types->ht->name, table_alias->type))
-              table_alias->st= types;
-          }
           ha_was_inited_ok(ht++);
         }
       }
@@ -457,11 +447,6 @@ int ha_init()
         {
           ha_was_inited_ok(ht++);
           types->ht= &innobase_hton;
-          for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
-          {
-            if (!my_strcasecmp(&my_charset_latin1, types->ht->name, table_alias->type))
-              table_alias->st= types;
-          }
         }
       }
       break;
@@ -479,11 +464,6 @@ int ha_init()
         {
           ha_was_inited_ok(ht++);
           types->ht= &ndbcluster_hton;
-          for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
-          {
-            if (!my_strcasecmp(&my_charset_latin1, types->ht->name, table_alias->type))
-              table_alias->st= types;
-          }
         }
       }
       break;

sql/handler.h

@@ -367,7 +367,6 @@ struct show_table_type_st {
 struct show_table_alias_st {
   const char *alias;
   const char *type;
-  show_table_type_st *st;
 };
 
 /* Possible flags of a handlerton */