Commit 0fe3b5af authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

Fixed sql_yacc.yy to be compatible with bison 1.31 and above. 

Made detection of GNU tar a bit more flexible.
Only use /usr/local/mysql-glibc if it actually exists
parent 14b55bcc

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -20,3 +20,4 @@ Sinisa@sinisa.nasamreza.org 
nick@nick.leippe.com

monty@tik.

zak@balfor.local

lenz@mysql.com

Build-tools/Do-linux-build

+8 −1
Original line number Diff line number Diff line 
#! /bin/sh



set -e -x



# Only use the "--with-other-libc" parameter, if another libc actually

# exists at this location

OTHER_LIBC_DIR=/usr/local/mysql-glibc

OTHER_LIBC=""

if [ -d OTHER_LIBC_DIR ] ; then

	OTHER_LIBC="--with-other-libc=$OTHER_LIBC_DIR"

fi



BUILD/compile-pentium-max --with-other-libc=$OTHER_LIBC_DIR \

BUILD/compile-pentium-max $OTHER_LIBC \

  --with-comment="Official MySQL Binary"  \

  --prefix=/usr/local/mysql --with-extra-charset=complex \

  --enable-thread-safe-client --enable-local-infile \

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
# Process this file with automake to create Makefile.in



AUTOMAKE_OPTIONS =	foreign

TAR =			gtar



# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE README \

			COPYING COPYING.LIB MIRRORS

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -364,6 +364,9 @@ AC_PATH_PROG(SED, sed, sed) 
AC_PATH_PROG(CMP, cmp, cmp)

AC_PATH_PROG(CHMOD, chmod, chmod)

AC_PATH_PROG(HOSTNAME, hostname, hostname)

# Check for a GNU tar named 'gtar', or 'gnutar' (MacOS X) and

# fall back to 'tar' otherwise and hope that it's a GNU tar as well

AC_CHECK_PROGS(TAR, gnutar gtar tar)

dnl We use a path for perl so the script startup works

dnl We make sure to use perl, not perl5, in hopes that the RPMs will

dnl not depend on the perl5 binary being installed (probably a bug in RPM)

sql/sql_yacc.yy

+8 −8
Original line number Diff line number Diff line
@@ -726,7 +726,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; }
@@ -1469,7 +1469,7 @@ simple_expr: 
                   (Item_func_match *)($$=new Item_func_match(*$2,$5))); }

	| BINARY expr %prec NEG	{ $$= new Item_func_binary($2); }

	| CASE_SYM opt_expr WHEN_SYM when_list opt_else END

	  { $$= new Item_func_case(* $4, $2, $5 ) }

	  { $$= new Item_func_case(* $4, $2, $5 ); }

	| FUNC_ARG0 '(' ')'

	  { $$= ((Item*(*)(void))($1.symbol->create_func))();}

	| FUNC_ARG1 '(' expr ')'
@@ -1696,7 +1696,7 @@ sum_expr: 
	  { $$=new Item_sum_sum($3); }



in_sum_expr:

	{ Lex->in_sum_expr++ }

	{ Lex->in_sum_expr++; }

	expr

	{

	  Lex->in_sum_expr--;
@@ -1730,7 +1730,7 @@ opt_else: 
	| ELSE expr    { $$= $2; }



when_list:

        { Lex->when_list.push_front(new List<Item>) }

        { Lex->when_list.push_front(new List<Item>); }

	when_list2

	{ $$= Lex->when_list.pop(); }
@@ -1753,7 +1753,7 @@ opt_pad: 
join_table_list:

	'(' join_table_list ')'	{ $$=$2; }

	| join_table		{ $$=$1; }

	| join_table_list normal_join join_table { $$=$3 }

	| join_table_list normal_join join_table { $$=$3; }

	| join_table_list STRAIGHT_JOIN join_table { $$=$3 ; $$->straight=1; }

	| join_table_list INNER_SYM JOIN_SYM join_table ON expr

	  { add_join_on($4,$6); $$=$4; }
@@ -1808,7 +1808,7 @@ opt_key_definition: 
	  { Lex->ignore_index= *$2; Lex->ignore_index_ptr= &Lex->ignore_index;}



key_usage_list:

	key_or_index { Lex->interval_list.empty() } '(' key_usage_list2 ')'

	key_or_index { Lex->interval_list.empty(); } '(' key_usage_list2 ')'

        { $$= &Lex->interval_list; }



key_usage_list2:
@@ -2287,7 +2287,7 @@ describe: 
	    YYABORT;

	}

	opt_describe_column

	| describe_command select { Lex->options|= SELECT_DESCRIBE };

	| describe_command select { Lex->options|= SELECT_DESCRIBE; };





describe_command:
@@ -2456,7 +2456,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; }