diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-01 18:15:24 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-01 18:15:24 -0600 |
| commit | 4ea92b81a73310e090ce1958cd728db86701045c (patch) | |
| tree | 445e5870c0aaf402990bfae29f7be28a7fccf2d7 /sql/sql_class.cc | |
| parent | ccada6ff956e2fed0347051890445049ec9ed8df (diff) | |
| parent | 2098f43a46119a72806d52ec63d920fc3948c12a (diff) | |
| download | mariadb-git-4ea92b81a73310e090ce1958cd728db86701045c.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
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 31621c531b0..a9a5e10a996 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= thread_specific_used= FALSE; hash_clear(&handler_tables_hash); tmp_table=0; used_tables=0; |