1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes to newly pushed code

Browse Source
This commit is contained in:
unknown 2004-03-12 15:56:28 +02:00
parent de448d41c0
commit 8f59091a71
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_db.cc
View File

@ -381,13 +381,13 @@ bool mysql_change_db(THD *thd,const char *name)
ulong db_access; ulong db_access;
DBUG_ENTER("mysql_change_db"); DBUG_ENTER("mysql_change_db");
if (!dbname || !(db_length= strlength(dbname))) if (!dbname || !(db_length= strlen(dbname)))
{ {
x_free(dbname); /* purecov: inspected */ x_free(dbname); /* purecov: inspected */
send_error(&thd->net,ER_NO_DB_ERROR); /* purecov: inspected */ send_error(&thd->net,ER_NO_DB_ERROR); /* purecov: inspected */
DBUG_RETURN(1); /* 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); net_printf(&thd->net,ER_WRONG_DB_NAME, dbname);
x_free(dbname); x_free(dbname);

3
sql/table.cc
View File

@ -1216,10 +1216,11 @@ bool check_table_name(const char *name, uint length)
#endif #endif
} }
bool check_column_name(const char *name) bool check_column_name(const char *name)
{ {
const char *start= name; const char *start= name;
bool last_char_is_space= false; bool last_char_is_space= FALSE;
while (*name) while (*name)
{ {