diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-10-03 17:54:39 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-10-03 17:54:39 +0300 |
| commit | eb007842428bb416b76e2fce30c13708a626ab77 (patch) | |
| tree | 89d2393ff1c2f9df517ec553ecc409a98a3ce6cd | |
| parent | 8d31718c5b4fe27fbed8dddf034d595ed7cee9ed (diff) | |
| parent | 9595cc332d5333eb6a361ec668351309831999c6 (diff) | |
| download | mariadb-git-eb007842428bb416b76e2fce30c13708a626ab77.tar.gz | |
Merge hundin.mysql.fi:/home/marko/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1
(Bug #13002)
sql/ha_innodb.cc:
Merged
| -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); |