diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-07 18:56:46 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-07 18:56:46 +0400 |
| commit | e58c0596954d22262199a7228427e9a1c29d8c76 (patch) | |
| tree | aea0b56133cbeab4c5fde346d4d0d5e8c647c3a0 /sql/sql_class.cc | |
| parent | 85ed11c60d569a54a32cce1588594ee18c43e40a (diff) | |
| parent | 783c6acd7fbb6809934312af84cbd0a8a8c120da (diff) | |
| download | mariadb-git-e58c0596954d22262199a7228427e9a1c29d8c76.tar.gz | |
Manual merge of local mysql-trunk-merge with bk-internal.
Conflicts:
Text conflict in sql/CMakeLists.txt
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 0f0ce605b54..f59ffd4d42f 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -536,7 +536,7 @@ THD::THD() count_cuted_fields= CHECK_FIELD_IGNORE; killed= NOT_KILLED; col_access=0; - is_slave_error= thread_specific_used= FALSE; + is_slave_error= thread_specific_used= thread_temporary_used= FALSE; my_hash_clear(&handler_tables_hash); tmp_table=0; used_tables=0; |