diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-05 13:08:00 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-05 13:08:00 +0200 |
| commit | 083194b188058be1ae66edf0ca7abb6138dec4d3 (patch) | |
| tree | ebaaee150fd57244707948e9099cf10b4299d8e4 /sql/sql_class.cc | |
| parent | ba3037cadd79c7143771d470edaab0a3bfc6520d (diff) | |
| parent | 97c1b3915e4456cf24377592030408cf51a9dd35 (diff) | |
| download | mariadb-git-083194b188058be1ae66edf0ca7abb6138dec4d3.tar.gz | |
merge
Docs/manual.texi:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/ft_dump.c:
Merge
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d76461b6faf..0b596c01f9d 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -84,7 +84,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0), host=user=priv_user=db=query=ip=0; host_or_ip="unknown ip"; locked=killed=count_cuted_fields=some_tables_deleted=no_errors=password= - query_start_used=0; + query_start_used=safe_to_cache_query=0; query_length=col_access=0; query_error=0; next_insert_id=last_insert_id=0; @@ -122,6 +122,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0), server_status=SERVER_STATUS_AUTOCOMMIT; update_lock_default= low_priority_updates ? TL_WRITE_LOW_PRIORITY : TL_WRITE; options=thd_startup_options; + query_cache_type = (byte)query_cache_startup_type; sql_mode=(uint) opt_sql_mode; inactive_timeout=net_wait_timeout; open_options=ha_open_options; |