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.cc | |
| 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.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 da975ee3103..514de445b56 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -394,7 +394,7 @@ THD::THD() count_cuted_fields= CHECK_FIELD_IGNORE; killed= NOT_KILLED; db_length= col_access=0; - query_error= tmp_table_used= 0; + query_error= tmp_table_used= thread_specific_used= 0; hash_clear(&handler_tables_hash); tmp_table=0; used_tables=0; |