diff options
author | unknown <dlenev@brandersnatch.localdomain> | 2004-05-24 15:48:53 +0400 |
---|---|---|
committer | unknown <dlenev@brandersnatch.localdomain> | 2004-05-24 15:48:53 +0400 |
commit | cc3d7f7a5be159623b23bfdce35ffc1f1aa41706 (patch) | |
tree | aeb3278265199a67bb2fb20cd435c12a82e9e925 /sql | |
parent | 11f369310536c269eaaeb3e81edc1a0bbaceead7 (diff) | |
parent | 0bf85cfdfaf8eb7315005760e9516bba5e530ce2 (diff) | |
download | mariadb-git-cc3d7f7a5be159623b23bfdce35ffc1f1aa41706.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_lex.cc | 2 | ||||
-rw-r--r-- | sql/sql_lex.h | 2 | ||||
-rw-r--r-- | sql/sql_yacc.yy | 6 |
3 files changed, 1 insertions, 9 deletions
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: |