database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Avoid spurious error when restoring INFORMATION_SCHEMA as the current

Browse Source 
database after failing to execute a stored procedure in an inaccessible
database. (Bug #12318)
This commit is contained in:
jimw@mysql.com
2005-08-11 17:04:16 -07:00
parent 03162293da
commit 3a815f45bd
7 changed files with 92 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_parse.cc
View File

@ -275,7 +275,7 @@ int check_user(THD *thd, enum enum_server_command command,
{
thd->db= 0;
thd->db_length= 0;
if (mysql_change_db(thd, db))
if (mysql_change_db(thd, db, FALSE))
{
/* Send the error to the client */
net_send_error(thd);
@ -284,8 +284,7 @@ int check_user(THD *thd, enum enum_server_command command,
DBUG_RETURN(-1);
}
}
else
send_ok(thd);
send_ok(thd);
DBUG_RETURN(0);
#else
@ -410,7 +409,7 @@ int check_user(THD *thd, enum enum_server_command command,
/* Change database if necessary */
if (db && db[0])
{
if (mysql_change_db(thd, db))
if (mysql_change_db(thd, db, FALSE))
{
/* Send error to the client */
net_send_error(thd);
@ -419,8 +418,7 @@ int check_user(THD *thd, enum enum_server_command command,
DBUG_RETURN(-1);
}
}
else
send_ok(thd);
send_ok(thd);
thd->password= test(passwd_len); // remember for error messages
/* Ready to handle queries */
DBUG_RETURN(0);
@ -1514,8 +1512,11 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
&LOCK_status);
thd->convert_string(&tmp, system_charset_info,
packet, strlen(packet), thd->charset());
if (!mysql_change_db(thd, tmp.str))
if (!mysql_change_db(thd, tmp.str, FALSE))
{
mysql_log.write(thd,command,"%s",thd->db);
send_ok(thd);
}
break;
}
#ifdef HAVE_REPLICATION
@ -3407,7 +3408,8 @@ end_with_restore_list:
}
#endif
case SQLCOM_CHANGE_DB:
mysql_change_db(thd,select_lex->db);
if (!mysql_change_db(thd,select_lex->db,FALSE))
send_ok(thd);
break;
case SQLCOM_LOAD: