bk commit into 5.1 tree (jimw:1.2129)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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.2129 06/02/17 10:55:43 jimw@stripped +1 -0
  Merge mysql.com:/home/jimw/my/mysql-5.1-17169
  into  mysql.com:/home/jimw/my/mysql-5.1-clean

  sql/sql_table.cc
    1.308 06/02/17 10:55:38 jimw@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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean/RESYNC

--- 1.307/sql/sql_table.cc	2006-02-17 08:12:18 -08:00
+++ 1.308/sql/sql_table.cc	2006-02-17 10:55:38 -08:00
@@ -50,11 +50,6 @@
                                handler *file, KEY **key_info_buffer,
                                uint *key_count, int select_field_count);
 
-static int mysql_copy_create_lists(List<create_field> *orig_create_list,
-                                   List<Key> *orig_key,
-                                   List<create_field> *new_create_list,
-                                   List<Key> *new_key);
-
 #define MYSQL50_TABLE_NAME_PREFIX         "#mysql50#"
 #define MYSQL50_TABLE_NAME_PREFIX_LENGTH  9
 
@@ -164,8 +159,7 @@
 */
 
 static int mysql_copy_create_list(List<create_field> *orig_create_list,
-
-                                   List<create_field> *new_create_list)
+                                  List<create_field> *new_create_list)
 {
   List_iterator<create_field> prep_field_it(*orig_create_list);
   create_field *prep_field;
@@ -205,7 +199,7 @@
 {
   List_iterator<Key> prep_key_it(*orig_key);
   Key *prep_key;
-  DBUG_ENTER("mysql_copy_create_lists");
+  DBUG_ENTER("mysql_copy_key_list");
 
   while ((prep_key= prep_key_it++))
   {
@@ -217,7 +211,8 @@
     while ((prep_col= prep_col_it++))
     {
       key_part_spec *prep_key_part;
-      if (prep_key_part= new key_part_spec(*prep_col))
+
+      if (!(prep_key_part= new key_part_spec(*prep_col)))
       {
         mem_alloc_error(sizeof(key_part_spec));
         DBUG_RETURN(TRUE);
@@ -228,11 +223,11 @@
         DBUG_RETURN(TRUE);
       }
     }
-    if ((temp_key= new Key(prep_key->type, prep_key->name,
-                           prep_key->algorithm,
-                           prep_key->generated,
-                           prep_columns,
-                           prep_key->parser_name)))
+    if (!(temp_key= new Key(prep_key->type, prep_key->name,
+                            prep_key->algorithm,
+                            prep_key->generated,
+                            prep_columns,
+                            prep_key->parser_name)))
     {
       mem_alloc_error(sizeof(Key));
       DBUG_RETURN(TRUE);