Merge hundin.mysql.fi:/home/marko/mysql-4.0

into hundin.mysql.fi:/home/marko/mysql-4.1 (Bug #13002)

Merge hundin.mysql.fi:/home/marko/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1 (Bug #13002)
bf307338 · marko@hundin.mysql.fi · 5dc00e0c · d62b9f4b · bf307338
Commit bf307338 authored Oct 03, 2005 by marko@hundin.mysql.fi
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/ha_innodb.cc sql/ha_innodb.cc +2 -1

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -4848,7 +4848,8 @@ ha_innobase::get_foreign_key_create_info(void)
 		fclose(file);
 	} else {
 		/* unable to create temporary file */
-          	str = my_malloc(1, MYF(MY_ZEROFILL));
+          	str = my_strdup(
+"/* Error: cannot display foreign key constraints */", MYF(0));
 	}

  	return(str);