Commit 1f353c00 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
parents a083d8c1 b78cdc25

sql/sql_yacc.yy

+2 −2
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ opt_table_options: 


table_options:

	table_option	{ $$=$1; }

	| table_option table_options { $$= $1 | $2 }

	| table_option table_options { $$= $1 | $2; }



table_option:

	TEMPORARY	{ $$=HA_LEX_CREATE_TMP_TABLE; }
@@ -2836,7 +2836,7 @@ literal: 
	| FLOAT_NUM	{ $$ =	new Item_float($1.str, $1.length); }

	| NULL_SYM	{ $$ =	new Item_null();

			  Lex->next_state=STATE_OPERATOR_OR_IDENT;}

	| HEX_NUM	{ $$ =	new Item_varbinary($1.str,$1.length)};

	| HEX_NUM	{ $$ =	new Item_varbinary($1.str,$1.length);}

	| DATE_SYM text_literal { $$ = $2; }

	| TIME_SYM text_literal { $$ = $2; }

	| TIMESTAMP text_literal { $$ = $2; }