diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-25 15:31:07 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-25 15:31:07 +0200 |
| commit | 49e0eea578eb119cafb2df1ba77b35fcf8391224 (patch) | |
| tree | 45f7768e20be3d146b414bb9b770a956b9601f78 /sql/sql_parse.cc | |
| parent | db47e4ca2479a8e7bde91757fa968c462ca2a343 (diff) | |
| parent | 4886e3d2d4e05faba9f13869c5e0e3b4dc6a7c1c (diff) | |
| download | mariadb-git-49e0eea578eb119cafb2df1ba77b35fcf8391224.tar.gz | |
Merge with 3.23.55
BitKeeper/deleted/.del-net.c~ef21d6402bb882f9:
Auto merged
innobase/os/os0file.c:
Auto merged
libmysql/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Build-tools/Do-compile:
Use local version
Makefile.am:
remove double libmysql_r
configure.in:
Use local
libmysql/libmysql.c:
Dont abort connection if too big packet error
sql/ha_innodb.cc:
use local
sql/net_serv.cc:
use local
sql/sql_parse.cc:
Merge with 3.23.55 (fix double free of user)
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 4a7fc78ee7f..0a5ebc585b2 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -977,6 +977,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, char *save_user= thd->user; char *save_priv_user= thd->priv_user; char *save_db= thd->db; + thd->user=0; USER_CONN *save_uc= thd->user_connect; if ((uint) ((uchar*) db - net->read_pos) > packet_length) @@ -987,7 +988,6 @@ bool dispatch_command(enum enum_server_command 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; |