Commit 099c25e1 authored by osku@127.(none)'s avatar osku@127.(none)

Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0

into  127.(none):/home/osku/mysql/5.0/clean
parents 953848b8 0305ddf2
...@@ -591,8 +591,7 @@ row_ins_set_detailed( ...@@ -591,8 +591,7 @@ row_ins_set_detailed(
FILE* tf = os_file_create_tmpfile(); FILE* tf = os_file_create_tmpfile();
ut_a(tf); if (tf) {
ut_print_name(tf, trx, foreign->foreign_table_name); ut_print_name(tf, trx, foreign->foreign_table_name);
dict_print_info_on_foreign_key_in_create_format(tf, trx, dict_print_info_on_foreign_key_in_create_format(tf, trx,
foreign, FALSE); foreign, FALSE);
...@@ -600,6 +599,9 @@ row_ins_set_detailed( ...@@ -600,6 +599,9 @@ row_ins_set_detailed(
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");
}
} }
/************************************************************************* /*************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment