bk commit into 5.1 tree (svoj:1.1925)

[svoj]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj 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.1925 05/10/14 01:26:35 svoj@stripped +4 -0
  Merge svojtovich@stripped:/home/bk/mysql-5.1
  into  mysql.com:/home/svoj/devel/mysql/engine/mysql-5.1

  sql/unireg.cc
    1.69 05/10/14 01:26:32 svoj@stripped +33 -8
    Manual merge - use local

  sql/table.cc
    1.185 05/10/14 01:26:32 svoj@stripped +59 -24
    Manual merge - use local

  sql/handler.h
    1.163 05/10/14 01:18:42 svoj@stripped +0 -0
    Auto merged

  sql/handler.cc
    1.189 05/10/14 01:18:42 svoj@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:	svoj
# Host:	svoj-laptop.mysql.com
# Root:	/home/svoj/devel/mysql/engine/mysql-5.1/RESYNC

--- 1.188/sql/handler.cc	2005-10-11 15:25:09 +05:00
+++ 1.189/sql/handler.cc	2005-10-14 01:18:42 +05:00
@@ -186,18 +186,15 @@
   THD *thd= current_thd;
   show_table_alias_st *table_alias;
   handlerton **types;
+  const char *ptr= name;
 
-  if (thd && !my_strnncoll(&my_charset_latin1,
-        (const uchar *)name, namelen,
-        (const uchar *)"DEFAULT", 7))
+  if (thd && !my_strcasecmp(&my_charset_latin1, ptr, "DEFAULT"))
     return (enum db_type) thd->variables.table_type;
 
 retest:
   for (types= sys_table_types; *types; types++)
   {
-    if (!my_strnncoll(&my_charset_latin1,
-          (const uchar *)name, namelen,
-          (const uchar *)(*types)->name, strlen((*types)->name)))
+    if (!my_strcasecmp(&my_charset_latin1, ptr, (*types)->name))
       return (enum db_type) (*types)->db_type;
   }
 
@@ -206,12 +203,9 @@
   */
   for (table_alias= sys_table_aliases; table_alias->type; table_alias++)
   {
-    if (!my_strnncoll(&my_charset_latin1,
-          (const uchar *)name, namelen,
-          (const uchar *)table_alias->alias, strlen(table_alias->alias)))
+    if (!my_strcasecmp(&my_charset_latin1, ptr, table_alias->alias))
     {
-      name= table_alias->type;
-      namelen= strlen(name);
+      ptr= table_alias->type;
       goto retest;
     }
   }

--- 1.162/sql/handler.h	2005-10-12 02:57:32 +05:00
+++ 1.163/sql/handler.h	2005-10-14 01:18:42 +05:00
@@ -664,7 +664,6 @@
   uint options;				/* OR of HA_CREATE_ options */
   uint raid_type,raid_chunks;
   uint merge_insert_method;
-  uint extra_size;                      /* length of extra data segment */
   bool table_existed;			/* 1 in create if table existed */
   bool frm_only;                        /* 1 if no ha_create_table() */
   bool varchar;                         /* 1 if table has a VARCHAR */