summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2003-01-21 16:11:07 +0100
committerunknown <serg@serg.mysql.com>2003-01-21 16:11:07 +0100
commit59e4e9df3de31ea75746d788581ad10cff63379a (patch)
treea6571d8f2616375a48fbaf03bc5383a2ae454836
parentc16c93ed262ff18ed8f049f070b8191b68832340 (diff)
parent581cbb3b84d36f8e0c2f84016d1db2c5b61b2c66 (diff)
downloadmariadb-git-59e4e9df3de31ea75746d788581ad10cff63379a.tar.gz
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
-rw-r--r--sql/sql_parse.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index d8a4a5fee83..d11548a62e2 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -793,6 +793,7 @@ bool do_command(THD *thd)
char *save_user= thd->user;
char *save_priv_user= thd->priv_user;
char *save_db= thd->db;
+ thd->user=0;
if ((uint) ((uchar*) db - net->read_pos) > packet_length)
{ // Check if protocol is ok
@@ -802,7 +803,6 @@ bool do_command(THD *thd)
if (check_user(thd, COM_CHANGE_USER, user, passwd, db, 0))
{ // Restore old user
x_free(thd->user);
- x_free(thd->db);
thd->master_access=save_master_access;
thd->db_access=save_db_access;
thd->db=save_db;