diff options
| author | unknown <thek@adventure.(none)> | 2007-07-02 21:03:10 +0200 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2007-07-02 21:03:10 +0200 |
| commit | be11de7a8ed93e5dd5d5abd1ca2e9ca5c3922db7 (patch) | |
| tree | 22952496fda992e3bdada73b563098c2f9e3bbea /sql/sql_db.cc | |
| parent | 3fcaaceaa99050df9cd23a6e0480dc2b8b8c688b (diff) | |
| parent | 289cc26c646f5a45e2c9fc6c0bb75f6f61d301a1 (diff) | |
| download | mariadb-git-be11de7a8ed93e5dd5d5abd1ca2e9ca5c3922db7.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
sql/ha_ndbcluster.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_cache.cc:
Manual merge.
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 43d84740f0b..a0c6f8a8e9d 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -1113,7 +1113,7 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, } } if (thd->killed || - (tot_list && mysql_rm_table_part2_with_lock(thd, tot_list, 1, 0, 1))) + (tot_list && mysql_rm_table_part2(thd, tot_list, 1, 0, 1, 1, 1))) goto err; /* Remove RAID directories */ |