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

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx
This commit is contained in:
dlenev@brandersnatch.localdomain 2004-05-24 15:48:53 +04:00
commit b6d976e419
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_lex.cc
View File

@ -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++)

2
sql/sql_lex.h
View File

@ -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)

6
sql/sql_yacc.yy
View File

@ -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: