diff options
| author | monty@mashka.mysql.fi <> | 2003-01-25 15:31:07 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-25 15:31:07 +0200 |
| commit | 1bdd1d0626fdb8f858a3c4bf82e0064ee19b042d (patch) | |
| tree | 45f7768e20be3d146b414bb9b770a956b9601f78 /sql | |
| parent | fa7a94ed14f0bdd39b99abfca872444fdb5fff11 (diff) | |
| parent | 5758da1476da75e481f944de4ec91e5464ce7b00 (diff) | |
| download | mariadb-git-1bdd1d0626fdb8f858a3c4bf82e0064ee19b042d.tar.gz | |
Merge with 3.23.55
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 46fbee0a7ea..ee3eb13d833 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3836,8 +3836,8 @@ struct show_var_st status_vars[]= { {"Not_flushed_key_blocks", (char*) &_my_blocks_changed, SHOW_LONG_CONST}, {"Not_flushed_delayed_rows", (char*) &delayed_rows_in_use, SHOW_LONG_CONST}, {"Open_tables", (char*) 0, SHOW_OPENTABLES}, - {"Open_files", (char*) &my_file_opened, SHOW_INT_CONST}, - {"Open_streams", (char*) &my_stream_opened, SHOW_INT_CONST}, + {"Open_files", (char*) &my_file_opened, SHOW_LONG_CONST}, + {"Open_streams", (char*) &my_stream_opened, SHOW_LONG_CONST}, {"Opened_tables", (char*) &opened_tables, SHOW_LONG}, {"Questions", (char*) 0, SHOW_QUESTION}, #ifdef HAVE_QUERY_CACHE 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; |