diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index eb2d2ace4676836e7bb1b4441050a57568662af7..6424b97b4226a6fb9712e61e06c9b8237f95794d 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1629,7 +1629,7 @@ mysql_execute_command(void)
 #else
     {
       ulong priv=0;
-      if (lex->name && strlen(lex->name) > NAME_LEN)
+      if (lex->name && (!lex->name[0] || strlen(lex->name) > NAME_LEN))
       {
 	net_printf(&thd->net,ER_WRONG_TABLE_NAME,lex->name);
 	res=0;