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 mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge

Browse Source 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
This commit is contained in:
dlenev@mockturtle.local
2006-09-29 19:39:15 +04:00
parent f9b3f1300b 76c5979f9e
commit 5c2a51292d
6 changed files with 151 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@ -1633,7 +1633,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
}
}
if (lock_table_names(thd, tables))
if (!drop_temporary && lock_table_names(thd, tables))
DBUG_RETURN(1);
/* Don't give warnings for not found errors, as we already generate notes */
@ -1818,7 +1818,8 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
}
}
unlock_table_names(thd, tables, (TABLE_LIST*) 0);
if (!drop_temporary)
unlock_table_names(thd, tables, (TABLE_LIST*) 0);
thd->no_warnings_for_error= 0;
DBUG_RETURN(error);
}