1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

into  mysql.com:/home/cps/mysql/devel/5.1-rename-bug
This commit is contained in:
petr/cps@owlet.local
2006-10-24 17:00:23 +04:00
15 changed files with 553 additions and 168 deletions

View File

@ -975,6 +975,10 @@ public:
thd Handler of the thread, trying to lock the table
table Table handler to check
count Number of locks already granted to the table
called_by_privileged_thread TRUE if called from a logger THD
(general_log_thd or slow_log_thd)
or by a privileged thread, which
has the right to lock log tables.
DESCRIPTION
Check whether a handler allows to lock the table. For instance,
@ -990,7 +994,7 @@ public:
virtual bool check_if_locking_is_allowed(uint sql_command,
ulong type, TABLE *table,
uint count,
bool called_by_logger_thread)
bool called_by_privileged_thread)
{
return TRUE;
}