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

Merge 5.1 main -> 5.1-rpl

Browse Source
This commit is contained in:
He Zhenxing
2008-09-06 08:51:17 +08:00
parent d0edf32230 d70d171cee
commit b17458dcc1
236 changed files with 143560 additions and 6402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_db.cc
View File

@ -920,20 +920,25 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
should be dropped while the database is being cleaned, but in
the event that a change in the code to remove other objects is
made, these drops should still not be logged.
Notice that the binary log have to be enabled over the call to
ha_drop_database(), since NDB otherwise detects the binary log
as disabled and will not log the drop database statement on any
other connected server.
*/
tmp_disable_binlog(thd);
if ((deleted= mysql_rm_known_files(thd, dirp, db, path, 0,
&dropped_tables)) >= 0)
{
ha_drop_database(path);
tmp_disable_binlog(thd);
query_cache_invalidate1(db);
(void) sp_drop_db_routines(thd, db); /* @todo Do not ignore errors */
#ifdef HAVE_EVENT_SCHEDULER
Events::drop_schema_events(thd, db);
#endif
error = 0;
reenable_binlog(thd);
}
reenable_binlog(thd);
}
if (!silent && deleted>=0)
{