summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-04-28 20:19:50 +0300
committerunknown <monty@mysql.com>2004-04-28 20:19:50 +0300
commitae629fff866dda4e0e3411b0614d0c1efdfb6362 (patch)
treee291189eeafdc3ec3d13555fa8bd4a082a08166f /sql/unireg.cc
parent5605374b668068ef5ede826b3d04e2fe7ead4f9f (diff)
downloadmariadb-git-ae629fff866dda4e0e3411b0614d0c1efdfb6362.tar.gz
Allow one to send empty strings with mysql_stmt_send_long_data()
mysql_stmt_reset() now resets param->long_data_used Abort if --defaults-file=path-name uses a non-existing file (Bug #3413) Fixed problem with symlink test (bug in 4.1.2) libmysql/libmysql.c: Allow one to send empty strings with mysql_stmt_send_long_data() mysql_stmt_reset() now resets param->long_data_used mysys/default.c: Abort if --defaults-file=path-name uses a non-existing file (Bug #3413) sql/unireg.cc: Fixed problem with symlink test: .frm table was not properly deleted if handler create failed
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 8d3e304b5da..bab021aed59 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -214,9 +214,13 @@ int rea_create_table(THD *thd, my_string file_name,
DBUG_ENTER("rea_create_table");
if (mysql_create_frm(thd, file_name, create_info,
- create_fields, keys, key_info, NULL) ||
- ha_create_table(file_name,create_info,0))
+ create_fields, keys, key_info, NULL))
DBUG_RETURN(1);
+ if (ha_create_table(file_name,create_info,0))
+ {
+ my_delete(file_name,MYF(0));
+ DBUG_RETURN(1);
+ }
DBUG_RETURN(0);
} /* rea_create_table */