bk commit into 4.0 tree (marko:1.2159) BUG#13002

[Marko Mäkelä]

Below is the list of changes that have just been committed into a local
4.0 repository of marko. When marko 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.2159 05/10/03 17:11:21 marko@stripped +1 -0
  InnoDB: Display an error message in /* */ comments
  in SHOW CREATE TABLE if a temporary file cannot be created.
  (Bug #13002)

  sql/ha_innodb.cc
    1.236 05/10/03 17:10:31 marko@stripped +6 -2
    ha_innobase::get_foreign_key_create_info(): Display an error
    message to the user if a temporary file cannot be created.

# 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:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/mysql-4.0

--- 1.235/sql/ha_innodb.cc	2005-08-24 17:27:34 +03:00
+++ 1.236/sql/ha_innodb.cc	2005-10-03 17:10:31 +03:00
@@ -4458,8 +4458,12 @@
 		fclose(file);
 	} else {
 		/* unable to create temporary file */
-		str = my_malloc(1, MYF(0));
-		str[0] = 0;
+		static const char out_of_tmp_files[]
+		= "/* Error: cannot display foreign key constraints */";
+          	str = my_malloc(sizeof out_of_tmp_files, MYF(0));
+		if (str) {
+			memcpy(str, out_of_tmp_files, sizeof out_of_tmp_files);
+		}
 	}
 
   	return(str);