diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-01 18:14:50 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-01 18:14:50 -0600 |
| commit | 41ac5d83b228e29345882b28517a0ba6933ecafb (patch) | |
| tree | 388d81a01a0bea738fcd0d47b69dca3795b38441 /sql/sql_class.h | |
| parent | 25723542a1ffcd3365b51a48bbab0e238306ab2a (diff) | |
| parent | 1b04b4b11382f63b5b276d0f5d046b29adca72d0 (diff) | |
| download | mariadb-git-41ac5d83b228e29345882b28517a0ba6933ecafb.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
sql/ha_federated.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/t/innodb_mysql.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 6ffbd9b4ac7..d4986138de1 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1469,6 +1469,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 */ |