Commit 65600db5 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixed bug when sorting big files (introduced with multi-table-delete) 

Changed mysql-test to use --language
Cleaned up parameters to filesort()
parent c7a6af05

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ AM_PROG_CC_STDC 


if test "$am_cv_prog_cc_stdc" = "no"

then

  AC_MSG_ERROR([MySQL requiers a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])

  AC_MSG_ERROR([MySQL requires a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])

fi



NOINST_LDFLAGS=

mysql-test/install_test_db.sh

+3 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ else 
fi



mdata=$data/mysql



EXTRA_ARG=""



if test ! -x $execdir/mysqld

then
@@ -57,9 +57,7 @@ if [ x$BINARY_DIST = x1 ] ; then 
basedir=..

else

basedir=.

rm -rf share

mkdir  share

ln -sf ../../sql/share share/mysql 

EXTRA_ARG="--language=../sql/share/english/"

fi



# Initialize variables
@@ -193,7 +191,7 @@ then 
fi



if $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \

    --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb --skip-gemini << END_OF_DATA

    --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb --skip-gemini $EXTRA_ARG << END_OF_DATA

use mysql;

$c_d

$i_d

mysql-test/mysql-test-run.sh

+14 −7
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ if [ x$SOURCE_DIST = x1 ] ; then 
 MYSQL_TEST="$BASEDIR/client/mysqltest"

 MYSQLADMIN="$BASEDIR/client/mysqladmin"

 MYSQL="$BASEDIR/client/mysql"

 LANGUAGE="$BASEDIR/sql/share/english/"

 INSTALL_DB="./install_test_db"

else

 MYSQLD="$BASEDIR/bin/mysqld"
@@ -267,6 +268,12 @@ else 
 MYSQLADMIN="$BASEDIR/bin/mysqladmin"

 MYSQL="$BASEDIR/bin/mysql"

 INSTALL_DB="./install_test_db -bin"

 if test -d "$BASEDIR/share/mysql/english" 

 then

   LANGUAGE="$BASEDIR/share/mysql/english/"

 else

   LANGUAGE="$BASEDIR/share/english/"

  fi

fi



# If we should run all tests cases, we will use a local server for that
@@ -478,7 +485,7 @@ start_master() 
	    --socket=$MASTER_MYSOCK \

            --log=$MASTER_MYLOG --default-character-set=latin1 \

	    --tmpdir=$MYSQL_TMP_DIR \

	    --language=english \

	    --language=$LANGUAGE \

            --innodb_data_file_path=ibdata1:50M \

	     $SMALL_SERVER \

	     $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
@@ -492,7 +499,7 @@ start_master() 
            --default-character-set=latin1 \

	    --core \

	    --tmpdir=$MYSQL_TMP_DIR \

	    --language=english \

	    --language=$LANGUAGE \

            --innodb_data_file_path=ibdata1:50M \

	     $SMALL_SERVER \

	     $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
@@ -548,7 +555,7 @@ start_slave() 
            --log=$SLAVE_MYLOG --default-character-set=latin1 \

	    --core \

	    --tmpdir=$MYSQL_TMP_DIR \

            --language=english \

            --language=$LANGUAGE \

	    --skip-innodb --skip-slave-start \

	    --report-host=127.0.0.1 --report-user=root \

	    --report-port=$SLAVE_MYPORT \
@@ -674,7 +681,7 @@ run_testcase () 
   SYST="    ...."

   REALT="    ...."

   timestr="$USERT $SYST $REALT"

   pname=`$ECHO "$tname                 "|$CUT -c 1-16`

   pname=`$ECHO "$tname                        "|$CUT -c 1-24`

   RES="$pname  $timestr"

   skip_inc

   $ECHO "$RES$RES_SPACE [ skipped ]"
@@ -755,7 +762,7 @@ run_testcase () 
    fi



    timestr="$USERT $SYST $REALT"

    pname=`$ECHO "$tname                 "|$CUT -c 1-16`

    pname=`$ECHO "$tname                        "|$CUT -c 1-24`

    RES="$pname  $timestr"



    if [ $res = 0 ]; then

mysql-test/r/big_test.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
using_big_test

1

mysql-test/r/select_found.result

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ b 
FOUND_ROWS()

6

b	c

2	1

5	3

FOUND_ROWS()

6

a	b	a	b