Skip to content

M
mariadb
Commit 935585a3 authored by unknown's avatar unknown
Browse files
Options

After review fixes 


client/mysql.cc:
  check for "error" added
sql/sql_db.cc:
  typo fixed
parent 84405cba
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
client/mysql.cc
View file @ 935585a3
...@@ -1921,7 +1921,8 @@ com_go(String *buffer,char *line __attribute__((unused))) ...@@ -1921,7 +1921,8 @@ com_go(String *buffer,char *line __attribute__((unused)))
if (err >= 1) if (err >= 1)
error= put_error(&mysql); error= put_error(&mysql);
if (!status.batch && (mysql.server_status & SERVER_STATUS_DB_DROPPED)) if (!error && !status.batch &&
(mysql.server_status & SERVER_STATUS_DB_DROPPED))
get_current_db(); get_current_db();
return error; /* New command follows */ return error; /* New command follows */
......
sql/sql_db.cc
View file @ 935585a3
...@@ -670,7 +670,7 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent) ...@@ -670,7 +670,7 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
} }
thd->server_status|= SERVER_STATUS_DB_DROPPED; thd->server_status|= SERVER_STATUS_DB_DROPPED;
send_ok(thd, (ulong) deleted); send_ok(thd, (ulong) deleted);
thd->server_status&= !SERVER_STATUS_DB_DROPPED; thd->server_status&= ~SERVER_STATUS_DB_DROPPED;
} }
exit: exit:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7