bk commit into 5.1 tree (jonas:1.2049)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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.2049 05/10/14 14:37:16 jonas@stripped +5 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-ndb-dd

  storage/ndb/src/ndbapi/ndberror.c
    1.55 05/10/14 14:37:12 jonas@stripped +0 -0
    Auto merged

  sql/sql_yacc.yy
    1.379 05/10/14 14:37:12 jonas@stripped +0 -0
    Auto merged

  sql/sql_lex.h
    1.187 05/10/14 14:37:12 jonas@stripped +0 -0
    Auto merged

  sql/handler.h
    1.149 05/10/14 14:37:12 jonas@stripped +0 -0
    Auto merged

  sql/handler.cc
    1.158 05/10/14 14:37:12 jonas@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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-ndb-dd/RESYNC

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

--- 1.148/sql/handler.h	2005-10-12 16:04:06 +02:00
+++ 1.149/sql/handler.h	2005-10-14 14:37:12 +02:00
@@ -664,6 +664,7 @@
   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 */
@@ -722,7 +723,7 @@
                                KEY *key_info,
                                const key_range *key_spec,
                                part_id_range *part_spec);
-bool mysql_unpack_partition(File file, THD *thd, uint part_info_len,
+bool mysql_unpack_partition(THD *thd, uchar *part_buf, uint part_info_len,
                             TABLE *table, enum db_type default_db_type);
 #endif
 

--- 1.186/sql/sql_lex.h	2005-10-10 14:35:17 +02:00
+++ 1.187/sql/sql_lex.h	2005-10-14 14:37:12 +02:00
@@ -698,7 +698,7 @@
   enum trg_event_type event;
 };
 
-extern sys_var_long_ptr trg_new_row_fake_var;
+extern sys_var *trg_new_row_fake_var;
 
 enum xa_option_words {XA_NONE, XA_JOIN, XA_RESUME, XA_ONE_PHASE,
                       XA_SUSPEND, XA_FOR_MIGRATE};

--- 1.378/sql/sql_yacc.yy	2005-10-10 14:35:18 +02:00
+++ 1.379/sql/sql_yacc.yy	2005-10-14 14:37:12 +02:00
@@ -8943,7 +8943,7 @@
         {
           LEX *lex=Lex;
 
-          if ($2.var == &trg_new_row_fake_var)
+          if ($2.var == trg_new_row_fake_var)
           {
             /* We are in trigger and assigning value to field of new row */
             Item *it;
@@ -9141,7 +9141,7 @@
                 YYABORT;
               }
               /* This special combination will denote field of NEW row */
-              $$.var= &trg_new_row_fake_var;
+              $$.var= trg_new_row_fake_var;
               $$.base_name= $3;
             }
             else

--- 1.54/storage/ndb/src/ndbapi/ndberror.c	2005-10-10 16:48:22 +02:00
+++ 1.55/storage/ndb/src/ndbapi/ndberror.c	2005-10-14 14:37:12 +02:00
@@ -353,8 +353,8 @@
   { 743,  HA_WRONG_CREATE_OPTION, SE, "Unsupported character set in table or index" },
   { 744,  DMEC, SE, "Character string is invalid for given character set" },
   { 745,  HA_WRONG_CREATE_OPTION, SE, "Distribution key not supported for char attribute (use binary attribute)" },
-  { 747,  HA_WRONG_CREATE_OPTION, AE, "Given NODEGROUP doesn't exist in this cluster" },
-  { 748,  HA_WRONG_CREATE_OPTION, IE, "Given fragmentType doesn't exist" },
+  { 771,  HA_WRONG_CREATE_OPTION, AE, "Given NODEGROUP doesn't exist in this cluster" },
+  { 772,  HA_WRONG_CREATE_OPTION, IE, "Given fragmentType doesn't exist" },
   { 749,  HA_WRONG_CREATE_OPTION, IE, "Primary Table in wrong state" },
   { 763,  HA_WRONG_CREATE_OPTION, SE, "Invalid undo buffer size" },
   { 764,  HA_WRONG_CREATE_OPTION, SE, "Invalid extent size" },