Moved lower_case_table_name check to right place.
This commit is contained in:
parent
5f1b9717c5
commit
a3c5ad1747
@ -323,9 +323,6 @@ bool mysql_change_db(THD *thd,const char *name)
|
|||||||
uint db_access;
|
uint db_access;
|
||||||
DBUG_ENTER("mysql_change_db");
|
DBUG_ENTER("mysql_change_db");
|
||||||
|
|
||||||
if (lower_case_table_names)
|
|
||||||
casedn_str(dbname);
|
|
||||||
|
|
||||||
if (!dbname || !(length=strip_sp(dbname)))
|
if (!dbname || !(length=strip_sp(dbname)))
|
||||||
{
|
{
|
||||||
x_free(dbname); /* purecov: inspected */
|
x_free(dbname); /* purecov: inspected */
|
||||||
@ -338,6 +335,8 @@ bool mysql_change_db(THD *thd,const char *name)
|
|||||||
x_free(dbname);
|
x_free(dbname);
|
||||||
DBUG_RETURN(1);
|
DBUG_RETURN(1);
|
||||||
}
|
}
|
||||||
|
if (lower_case_table_names)
|
||||||
|
casedn_str(dbname);
|
||||||
DBUG_PRINT("general",("Use database: %s", dbname));
|
DBUG_PRINT("general",("Use database: %s", dbname));
|
||||||
if (test_all_bits(thd->master_access,DB_ACLS))
|
if (test_all_bits(thd->master_access,DB_ACLS))
|
||||||
db_access=DB_ACLS;
|
db_access=DB_ACLS;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user