database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

After merge fixes

Browse Source
This commit is contained in:
monty@mysql.com
2004-03-17 10:30:40 +02:00
parent 350b433569
commit 44667503b7
12 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_db.cc
View File

@ -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<String> it(raid_dirs);
String *dir;
if (thd->killed ||
(tot_list && mysql_rm_table_part2_with_lock(thd, tot_list, 1, 0, 1)))
goto err;