diff options
author | unknown <sasha@mysql.sashanet.com> | 2000-11-27 23:10:49 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2000-11-27 23:10:49 -0700 |
commit | f50b95d29a086d23132d557fbec3e6129ae81a3f (patch) | |
tree | 39bb69a9d25395c95dbba09f15eba543e26775c8 /sql/sql_class.cc | |
parent | c5a8038661fc912198401777612a944cbdfb5f6c (diff) | |
parent | 2e3896ecf1b4b196ed0e229583c3a45c754d1ce7 (diff) | |
download | mariadb-git-f50b95d29a086d23132d557fbec3e6129ae81a3f.tar.gz |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
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 067e75ceeef..c484573c560 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -80,7 +80,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0), global_read_lock(0) { proc_info="login"; - host=user=db=query=ip=0; + host=user=priv_user=db=query=ip=0; locked=killed=count_cuted_fields=some_tables_deleted=no_errors=password= query_start_used=0; query_length=col_access=0; |