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 | 5aa81b561e9d1604533c37498c471cd853fb72a5 (patch) | |
| tree | 2b7e93bbe62a86d3dc9de1c82450398a83d59e1a /storage/csv | |
| parent | 66b872805cbd542c6012eef7141443d95a697f7d (diff) | |
| parent | 9438b9851901c48f8e280c2665f9469c2f998c2f (diff) | |
| download | mariadb-git-5aa81b561e9d1604533c37498c471cd853fb72a5.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 'storage/csv')
| -rw-r--r-- | storage/csv/ha_tina.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index dad28a74af6..98fae83f34f 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -826,9 +826,9 @@ void ha_tina::update_status() bool ha_tina::check_if_locking_is_allowed(uint sql_command, ulong type, TABLE *table, uint count, - bool called_by_logger_thread) + bool called_by_privileged_thread) { - if (!called_by_logger_thread) + if (!called_by_privileged_thread) return check_if_log_table_locking_is_allowed(sql_command, type, table); return TRUE; |