summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-06-21 10:21:20 +0300
committermonty@mysql.com <>2004-06-21 10:21:20 +0300
commit1388c164bcd235c9612961bc902cd9e77b079a89 (patch)
treea55d40c04126c696aec19a9bdd340a11258e07e6 /sql/sql_class.cc
parentb11d25883554a7e3da972cc593a9d2a0c6094096 (diff)
downloadmariadb-git-1388c164bcd235c9612961bc902cd9e77b079a89.tar.gz
After merge fixes
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 704662fa4bf..7d0e0c3f78f 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -162,7 +162,8 @@ THD::THD():user_time(0), current_statement(0), is_fatal_error(0),
{
host= user= priv_user= db= ip=0;
host_or_ip= "connecting host";
- locked=killed=some_tables_deleted=no_errors=password= 0;
+ locked=some_tables_deleted=no_errors=password= 0;
+ killed=0;
query_start_used= 0;
count_cuted_fields= CHECK_FIELD_IGNORE;
db_length= col_access= 0;