diff options
| author | unknown <petr/cps@owlet.local> | 2006-10-24 17:00:23 +0400 |
|---|---|---|
| committer | unknown <petr/cps@owlet.local> | 2006-10-24 17:00:23 +0400 |
| commit | b5fc0d4617e81d768383f702f65eee52926b602b (patch) | |
| tree | 2b7e93bbe62a86d3dc9de1c82450398a83d59e1a /sql/handler.cc | |
| parent | c53bf4621b0e12e917a53d795f2051cbc8790474 (diff) | |
| parent | 577dedb015364bc1bab52e160f35590adf4528e3 (diff) | |
| download | mariadb-git-b5fc0d4617e81d768383f702f65eee52926b602b.tar.gz | |
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/home/cps/mysql/devel/5.1-rename-bug
mysql-test/r/log_tables.result:
Auto merged
mysql-test/t/log_tables.test:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/table.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
sql/log.cc:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sql_table.cc:
manual merge
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index ccf1a1ef8d9..8729d2fb21f 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1483,8 +1483,9 @@ bool handler::check_if_log_table_locking_is_allowed(uint sql_command, { /* Deny locking of the log tables, which is incompatible with - concurrent insert. Unless called from a logger THD: - general_log_thd or slow_log_thd. + concurrent insert. The routine is not called if the table is + being locked from a logger THD (general_log_thd or slow_log_thd) + or from a privileged thread (see log.cc for details) */ if (table->s->log_table && sql_command != SQLCOM_TRUNCATE && |