summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.cc
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2005-10-03 17:46:27 +0300
committerunknown <marko@hundin.mysql.fi>2005-10-03 17:46:27 +0300
commit9595cc332d5333eb6a361ec668351309831999c6 (patch)
tree8a4425e01ef6da4db656795b1a51e52bbb19a0d5 /sql/ha_innodb.cc
parentf03bc6c52ad7527473c7020416a53cce1a8cb392 (diff)
downloadmariadb-git-9595cc332d5333eb6a361ec668351309831999c6.tar.gz
InnoDB: Display an error message in /* */ comments
in SHOW CREATE TABLE if a temporary file cannot be created. (Bug #13002) sql/ha_innodb.cc: ha_innobase::get_foreign_key_create_info(): Display an error message to the user if a temporary file cannot be created.
Diffstat (limited to 'sql/ha_innodb.cc')
-rw-r--r--sql/ha_innodb.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 3ae56f13478..d994c76fb3f 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -4458,8 +4458,8 @@ ha_innobase::get_foreign_key_create_info(void)
fclose(file);
} else {
/* unable to create temporary file */
- str = my_malloc(1, MYF(0));
- str[0] = 0;
+ str = my_strdup(
+"/* Error: cannot display foreign key constraints */", MYF(0));
}
return(str);