1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Merge mysql.com:/home/mydev/mysql-4.1-4100

into  mysql.com:/home/mydev/mysql-5.0-5000
This commit is contained in:
ingo@mysql.com
2005-08-29 18:18:30 +02:00
12 changed files with 205 additions and 25 deletions

View File

@@ -2991,7 +2991,24 @@ end_with_restore_list:
goto error;
}
if (!select_lex->db)
select_lex->db= first_table->db;
{
/*
In the case of ALTER TABLE ... RENAME we should supply the
default database if the new name is not explicitly qualified
by a database. (Bug #11493)
*/
if (lex->alter_info.flags & ALTER_RENAME)
{
if (! thd->db)
{
send_error(thd,ER_NO_DB_ERROR);
goto error;
}
select_lex->db= thd->db;
}
else
select_lex->db= first_table->db;
}
if (check_access(thd, ALTER_ACL, first_table->db,
&first_table->grant.privilege, 0, 0) ||
check_access(thd,INSERT_ACL | CREATE_ACL,select_lex->db,&priv,0,0)||