diff options
author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-08-01 15:31:20 +0500 |
---|---|---|
committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-08-01 15:31:20 +0500 |
commit | d4ba395aa6a61ed9c25838aec409270429db281b (patch) | |
tree | dab728c3f27061a6f6225499edc46f884915bc46 /sql/sql_class.h | |
parent | 06cffaabd1ae2c054599ec7516c5b6bc94c0c609 (diff) | |
parent | f87acb594a15b415b58a3053e76bfd1b27a6d594 (diff) | |
download | mariadb-git-d4ba395aa6a61ed9c25838aec409270429db281b.tar.gz |
Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0
into mysql.com:/home/ram/work/b29928.new/b29928.new.5.1
mysql-test/r/mysqlbinlog.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/t/mysqlbinlog.test:
manual merge
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 71c13e001ee..38782c57a40 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1406,6 +1406,9 @@ public: bool in_lock_tables; bool query_error, bootstrap, cleanup_done; bool tmp_table_used; + + /** is set if some thread specific value(s) used in a statement. */ + bool thread_specific_used; bool charset_is_system_charset, charset_is_collation_connection; bool charset_is_character_set_filesystem; bool enable_slow_log; /* enable slow log for current statement */ |