diff options
| author | marko@hundin.mysql.fi <> | 2005-10-03 17:54:39 +0300 |
|---|---|---|
| committer | marko@hundin.mysql.fi <> | 2005-10-03 17:54:39 +0300 |
| commit | bf30733840628d20f225a06e084975a35469d71c (patch) | |
| tree | 89d2393ff1c2f9df517ec553ecc409a98a3ce6cd /sql | |
| parent | 5dc00e0cac6bac0e42e78879038aca4f307750b6 (diff) | |
| parent | d62b9f4b4b64532e296c9dc58b2102b3cfec981f (diff) | |
| download | mariadb-git-bf30733840628d20f225a06e084975a35469d71c.tar.gz | |
Merge hundin.mysql.fi:/home/marko/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1
(Bug #13002)
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 5b0e5377962..5c81dd2163c 100644 --- 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); |