bk commit into 5.1 tree (mskold:1.2610)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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@stripped, 2007-09-10 12:21:53+02:00, mskold@stripped +1 -0
  Added error handling when calling create_temporary_table

  sql/sql_table.cc@stripped, 2007-09-10 12:20:52+02:00, mskold@stripped +13 -5
    Added error handling when calling create_temporary_table

diff -Nrup a/sql/sql_table.cc b/sql/sql_table.cc
--- a/sql/sql_table.cc	2007-09-07 12:29:54 +02:00
+++ b/sql/sql_table.cc	2007-09-10 12:20:52 +02:00
@@ -5451,9 +5451,13 @@ TABLE *create_altered_table(THD *thd,
     my_casedn_str(files_charset_info, tmp_name);
   altered_create_info.options&= ~HA_LEX_CREATE_TMP_TABLE;
   altered_create_info.frm_only= 1;
-  error= create_temporary_table(thd, table, new_db, tmp_name,
-                                &altered_create_info,
-                                alter_info, db_change);
+  if ((error= create_temporary_table(thd, table, new_db, tmp_name,
+                                     &altered_create_info,
+                                     alter_info, db_change)))
+  {
+    DBUG_PRINT("info", ("Error %u while creating temporary table", error));
+    DBUG_RETURN(NULL);
+  };
 
   build_table_filename(path, sizeof(path), new_db, tmp_name, "",
                        FN_IS_TMP);
@@ -6612,8 +6616,12 @@ view_err:
 
 
   /* Create a temporary table with the new format */
-  error= create_temporary_table(thd, table, new_db, tmp_name, create_info,
-                                alter_info, !strcmp(db, new_db));
+  if ((error= create_temporary_table(thd, table, new_db, tmp_name, 
+                                     create_info, alter_info, 
+                                     !strcmp(db, new_db))))
+  {
+    goto err;
+  }
 
   /* Open the table so we need to copy the data to it. */
   if (table->s->tmp_table)