Commit cde08965 authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

Merge hundin:/my/mysql-3.23 into tik.mysql.fi:/home/my/mysql-3.23

parents 8c01c96f 539718ba

bdb/dist/s_recover

+10 −2
Original line number Diff line number Diff line
@@ -12,6 +12,13 @@ rm -f $loglist 


trap 'rm -f $t; exit 1' 1 2 3 13 15



# Use the standard -k option if it works;

# otherwise fall back on the traditional notation.

if sort -k 1,1 /dev/null

then sort_2_etc='-k 2'

else sort_2_etc='+1'

fi



# Check to make sure we haven't duplicated a log record entry, and build

# the list of log record types that the test suite uses.

for i in $DIR; do
@@ -19,13 +26,14 @@ for i in $DIR; do 
	for f in ../$i/*.src; do

		# Grab the PREFIX;  there should only be one per file, and

		# so it's okay to just take the first.

		grep '^PREFIX' $f | head -1

		grep '^PREFIX' $f | sed q

		egrep '^DEPRECATED[	 ]|^BEGIN[	 ]' $f | \

		    awk '{print $1 "\t" $2 "\t" $3}'



	done

done > $loglist

grep -v '^PREFIX' $loglist | awk '{print $2 "\t" $3}' | sort +1 -n | \

grep -v '^PREFIX' $loglist | awk '{print $2 "\t" $3}' | \

    sort $sort_2_etc -n | \

    uniq -d -f 1 > $t

[ -s $t ] && {

	echo "DUPLICATE LOG VALUES:"

configure.in

+2 −0
Original line number Diff line number Diff line
@@ -611,6 +611,8 @@ AC_ARG_ENABLE(local-infile, 
    [ ENABLED_LOCAL_INFILE=no ]

    )



AC_SUBST(ENABLE_LOCAL_INFILE)



# Use Paul Eggerts macros from GNU tar to check for large file support.

MYSQL_SYS_LARGEFILE

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ mysql_init(MYSQL *mysql) 


/*

  Only enable LOAD DATA INFILE by default if configured with

  --with-enabled-local-inflile

  --enable-local-infile

*/

#ifdef ENABLED_LOCAL_INFILE

  mysql->options.client_flag|= CLIENT_LOCAL_FILES;

mysql-test/mysql-test-run.sh

+6 −5
Original line number Diff line number Diff line
@@ -44,21 +44,22 @@ which () 


# No paths below as we can't be sure where the program is!



BASENAME=`which basename | head -1`

DIFF=`which diff | head -1`

SED=sed



BASENAME=`which basename | $SED q`

DIFF=`which diff | $SED q`

CAT=cat

CUT=cut

TAIL=tail

ECHO=echo # use internal echo if possible

EXPR=expr # use internal if possible

FIND=find

GCOV=`which gcov | head -1`

GCOV=`which gcov | $SED q`

PRINTF=printf

RM=rm

TIME=time

TR=tr

XARGS=`which xargs | head -1`

SED=sed

XARGS=`which xargs | $SED q`



# Are we using a source or a binary distribution?

scripts/safe_mysqld.sh

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ do 
    I=1

    while test "$I" -le "$numofproces"

    do 

      PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` 

      PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` 

	for T in $PROC

	do

	  break