Fixes to newly pushed code
This commit is contained in:
parent
de448d41c0
commit
8f59091a71
@ -381,13 +381,13 @@ bool mysql_change_db(THD *thd,const char *name)
|
||||
ulong db_access;
|
||||
DBUG_ENTER("mysql_change_db");
|
||||
|
||||
if (!dbname || !(db_length= strlength(dbname)))
|
||||
if (!dbname || !(db_length= strlen(dbname)))
|
||||
{
|
||||
x_free(dbname); /* purecov: inspected */
|
||||
send_error(&thd->net,ER_NO_DB_ERROR); /* purecov: inspected */
|
||||
DBUG_RETURN(1); /* purecov: inspected */
|
||||
}
|
||||
if ((db_length > NAME_LEN) || check_db_name(dbname))
|
||||
if (check_db_name(dbname))
|
||||
{
|
||||
net_printf(&thd->net,ER_WRONG_DB_NAME, dbname);
|
||||
x_free(dbname);
|
||||
|
@ -1216,10 +1216,11 @@ bool check_table_name(const char *name, uint length)
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
bool check_column_name(const char *name)
|
||||
{
|
||||
const char *start= name;
|
||||
bool last_char_is_space= false;
|
||||
bool last_char_is_space= FALSE;
|
||||
|
||||
while (*name)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user