summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-17 17:53:27 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-17 17:53:27 +0300
commit28097f40d3d13a1d42ef7a98b2ebc3330fd41a83 (patch)
tree0bf9a91a591cb8a20364f84c6e12048a66a548f5 /sql
parent3324d0a7ffb4c1d7ec2335c3e423bcbfaa963bce (diff)
downloadmariadb-git-28097f40d3d13a1d42ef7a98b2ebc3330fd41a83.tar.gz
Fixed locking problem when using bulk insert
Fixed array overrun when using drop_db Portability fixes BitKeeper/etc/ignore: Added libmysqld/examples/completion_hash.cc libmysqld/examples/completion_hash.h libmysqld/examples/my_readline.h libmysqld/examples/mysql.cc libmysqld/examples/mysqltest.c libmysqld/examples/readline.cc libmysqld/examples/sql_string.cc libmysqld/examples/sql_string.h to the ignore list acinclude.m4: Fixed reference to top_builddir myisam/mi_write.c: Fixed locking problem when using bulk insert sql/sql_db.cc: Fixed array overrun when using drop_db
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_db.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index cacb154fe6b..05b380ebd77 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -246,7 +246,7 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
/* Drop the table nicely */
*fn_ext(file->name)=0; // Remove extension
TABLE_LIST *table_list=(TABLE_LIST*)
- thd->calloc(sizeof(*table_list)+ strlen(db)+strlen(file->name)+1);
+ thd->calloc(sizeof(*table_list)+ strlen(db)+strlen(file->name)+2);
if (!table_list)
{
my_dirend(dirp);