From b523802138eef0c66d6ce89263b512c1494a277b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 17 Mar 2004 10:30:40 +0200 Subject: After merge fixes --- sql/sql_db.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sql/sql_db.cc') diff --git a/sql/sql_db.cc b/sql/sql_db.cc index eed6c741f1b..489c8aa425f 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -488,7 +488,8 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, if ((mysql_rm_known_files(thd, new_dirp, NullS, newpath,1)) < 0) goto err; if (!(copy_of_path= thd->memdup(newpath, length+1)) || - !(dir= new (&thd->mem_root) String(copy_of_path, length)) || + !(dir= new (&thd->mem_root) String(copy_of_path, length, + &my_charset_bin)) || raid_dirs.push_back(dir)) goto err; continue; @@ -529,9 +530,6 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, deleted++; } } - List_iterator it(raid_dirs); - String *dir; - if (thd->killed || (tot_list && mysql_rm_table_part2_with_lock(thd, tot_list, 1, 0, 1))) goto err; -- cgit v1.2.1