diff options
| author | unknown <msvensson@msdesk.(none)> | 2005-10-06 14:40:18 +0200 |
|---|---|---|
| committer | unknown <msvensson@msdesk.(none)> | 2005-10-06 14:40:18 +0200 |
| commit | df76450716d0550d8313f5d4afecd0e105558b5a (patch) | |
| tree | 734fdb74393f521e44d3e254c283586558f54ca4 /sql/ha_innodb.cc | |
| parent | 3c2dca475dfa91c95f2488831fafacacaf852347 (diff) | |
| parent | e6ec5794f64617dda0cfdeb4bae422cff6d81950 (diff) | |
| download | mariadb-git-df76450716d0550d8313f5d4afecd0e105558b5a.tar.gz | |
Merge msdesk.(none):/home/msvensson/mysql-4.1
into msdesk.(none):/home/msvensson/mysql-5.0
BUILD/SETUP.sh:
Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
Auto merged
innobase/os/os0sync.c:
Auto merged
mysql-test/r/ctype_tis620.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_uca.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
client/mysql.cc:
Sam change in both 4.1 and 5.0
mysql-test/r/ctype_uca.result:
Merge
mysql-test/r/ctype_ujis.result:
Merge
strings/ctype-mb.c:
Merge
strings/ctype-tis620.c:
Merge
Diffstat (limited to 'sql/ha_innodb.cc')
| -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 85f26425099..e8e1ef5169b 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -5770,7 +5770,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); |