diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-10-04 00:21:54 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-10-04 00:21:54 +0300 |
| commit | 319dd6aea73e60f2b1b6e6001a360a06899f144f (patch) | |
| tree | 2d90210a51e677609368be534a8bb30a412cf28b | |
| parent | 19dffd265e0e6b63572d226310cb3b9d17555fc5 (diff) | |
| parent | eb007842428bb416b76e2fce30c13708a626ab77 (diff) | |
| download | mariadb-git-319dd6aea73e60f2b1b6e6001a360a06899f144f.tar.gz | |
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
| -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); |