diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 0d3ab196aa5..f98a6b43846 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -22,8 +22,6 @@
 #include <m_ctype.h>
 #include <hash.h>
 
-LEX_STRING tmp_table_alias= {(char*) "tmp-table",8};
-
 /* Macros to look like lex */
 
 #define yyGet()		*(lex->ptr++)
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 2df2c998ff0..e458fe96cff 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -642,6 +642,4 @@ void lex_end(LEX *lex);
 
 extern pthread_key(LEX*,THR_LEX);
 
-extern LEX_STRING tmp_table_alias;
-
 #define current_lex (current_thd->lex)
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 45e8e6e67e2..6c544030b41 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -917,11 +917,7 @@ create:
 	  THD *thd= YYTHD;
 	  LEX *lex=Lex;
 	  lex->sql_command= SQLCOM_CREATE_TABLE;
-	  if (!lex->select_lex.add_table_to_list(thd,$5,
-						 ($2 &
-						  HA_LEX_CREATE_TMP_TABLE ?
-						  &tmp_table_alias :
-						  (LEX_STRING*) 0),
+	  if (!lex->select_lex.add_table_to_list(thd, $5, NULL,
 						 TL_OPTION_UPDATING,
 						 (using_update_log ?
 						  TL_READ_NO_INSERT: