summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <osku@127.(none)>2005-09-26 13:25:53 +0300
committerunknown <osku@127.(none)>2005-09-26 13:25:53 +0300
commit6f126ba4d0964304937f5a26d7e33c56933fe42b (patch)
tree752e6632afbe15ff5040378e5ded657d11ce6d1e
parentcbfe4f5995cd8b6f7b4c4f50f6e166e1cd7dedbc (diff)
parent3d23a2344f4c80437953c4f780d1582ed582f1b2 (diff)
downloadmariadb-git-6f126ba4d0964304937f5a26d7e33c56933fe42b.tar.gz
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into 127.(none):/home/osku/mysql/5.0/clean
-rw-r--r--innobase/row/row0ins.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/innobase/row/row0ins.c b/innobase/row/row0ins.c
index db871a53c42..5e833372299 100644
--- a/innobase/row/row0ins.c
+++ b/innobase/row/row0ins.c
@@ -591,15 +591,17 @@ row_ins_set_detailed(
FILE* tf = os_file_create_tmpfile();
- ut_a(tf);
-
- ut_print_name(tf, trx, foreign->foreign_table_name);
- dict_print_info_on_foreign_key_in_create_format(tf, trx,
- foreign, FALSE);
+ if (tf) {
+ ut_print_name(tf, trx, foreign->foreign_table_name);
+ dict_print_info_on_foreign_key_in_create_format(tf, trx,
+ foreign, FALSE);
- trx_set_detailed_error_from_file(trx, tf);
+ trx_set_detailed_error_from_file(trx, tf);
- fclose(tf);
+ fclose(tf);
+ } else {
+ trx_set_detailed_error(trx, "temp file creation failed");
+ }
}
/*************************************************************************