diff options
| author | unknown <kostja@bodhi.local> | 2006-08-30 00:45:33 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-08-30 00:45:33 +0400 |
| commit | 8ea5f31a46e9edcd773a1ce3655c8ce9e0d0ed33 (patch) | |
| tree | 55ee75a4f6e2dfc6ac630c5e0f0e66445bae20fb /sql/sql_class.cc | |
| parent | 01ec88dcd8d49aede05ba1f22270708d132f3ffe (diff) | |
| parent | 4355ea5a38c819cf1e98089b3d85fc628c48da46 (diff) | |
| download | mariadb-git-8ea5f31a46e9edcd773a1ce3655c8ce9e0d0ed33.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-14897
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/r/grant.result:
Manual merge.
mysql-test/r/view.result:
Manual merge.
mysql-test/t/grant.test:
Manual merge.
mysql-test/t/view.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 759e3b1a60b..093173ab949 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -224,7 +224,7 @@ THD::THD() #endif client_capabilities= 0; // minimalistic client net.last_error[0]=0; // If error on boot - net.query_cache_query=0; // If error on boot + query_cache_init_query(&net); // If error on boot ull=0; system_thread= cleanup_done= abort_on_warning= no_warnings_for_error= 0; peer_port= 0; // For SHOW PROCESSLIST |