Commit 5dda41a7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/extern/mysql/bk/mysql-5.0 

into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
parents b5e313f3 107ad3a0

mysql-test/mysql-test-run.sh

+12 −3
Original line number Diff line number Diff line
@@ -202,7 +202,14 @@ SYST=0 
REALT=0

FAST_START=""

MYSQL_TMP_DIR=$MYSQL_TEST_DIR/var/tmp

SLAVE_LOAD_TMPDIR=../../var/tmp #needs to be same length to test logging



# Use a relative path for where the slave will find the dumps

# generated by "LOAD DATA" on the master. The path is relative

# since it must have fixed length to test logging

# i.e otherwise the output from "SHOW MASTER STATUS" will vary

# with the strlen() of MYSQL_TEST_DIR

SLAVE_LOAD_TMPDIR=../tmp



RES_SPACE="      "

MYSQLD_SRC_DIRS="strings mysys include extra regex myisam \

 myisammrg heap sql"
@@ -601,7 +608,9 @@ fi 
[ -d $MYSQL_TEST_DIR/var/tmp ] || mkdir $MYSQL_TEST_DIR/var/tmp

[ -d $MYSQL_TEST_DIR/var/run ] || mkdir $MYSQL_TEST_DIR/var/run

[ -d $MYSQL_TEST_DIR/var/log ] || mkdir $MYSQL_TEST_DIR/var/log

ln -s $MYSQL_TEST_DIR/std_data $MYSQL_TEST_DIR/var/std_data_ln

if ! test -L $MYSQL_TEST_DIR/var/std_data_ln ; then

  ln -s $MYSQL_TEST_DIR/std_data/ $MYSQL_TEST_DIR/var/std_data_ln

fi



if test ${COLUMNS:-0} -lt 80 ; then COLUMNS=80 ; fi

E=`$EXPR $COLUMNS - 8`

mysql-test/t/trigger-grant.test

+3 −3
Original line number Diff line number Diff line
@@ -232,9 +232,9 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1 
  FOR EACH ROW

    SET @a = 5;



--exec egrep -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG

--exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQL_TEST_DIR/var/tmp/t1.TRG

--exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG

--exec egrep -v '^definers=' $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG > $MYSQLTEST_VARDIR/tmp/t1.TRG

--exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQLTEST_VARDIR/tmp/t1.TRG

--exec mv $MYSQLTEST_VARDIR/tmp/t1.TRG $MYSQLTEST_VARDIR/master-data/mysqltest_db1/t1.TRG



--echo