Commit 8f59091a authored by unknown's avatar unknown
Browse files

Fixes to newly pushed code

parent de448d41

sql/sql_db.cc

+2 −2
Original line number Diff line number Diff line
@@ -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);

sql/table.cc

+2 −1
Original line number Diff line number Diff line
@@ -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)

  {