List:Commits« Previous MessageNext Message »
From:msvensson Date:January 24 2006 12:33pm
Subject:bk commit into 5.0 tree (msvensson:1.2005)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2005 06/01/24 13:33:00 msvensson@neptunus.(none) +1 -0
  Merge

  mysql-test/t/mysqltest.test
    1.31 06/01/24 13:32:53 msvensson@neptunus.(none) +14 -19
    Update after merge

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration

--- 1.30/mysql-test/t/mysqltest.test	2006-01-24 08:43:30 +01:00
+++ 1.31/mysql-test/t/mysqltest.test	2006-01-24 13:32:53 +01:00
@@ -368,10 +368,10 @@
 # Missing delimiter until eof
 # The comment will be "sucked into" the sleep command since
 # delimiter is missing 
---system echo "sleep 7" > var/tmp/mysqltest.sql
---system echo "# Another comment" >> var/tmp/mysqltest.sql
+--system echo "sleep 7" > $MYSQLTEST_VARDIR/tmp/mysqltest.sql
+--system echo "# Another comment" >> $MYSQLTEST_VARDIR/tmp/mysqltest.sql
 --error 1
---exec $MYSQL_TEST < var/tmp/mysqltest.sql 2>&1
+--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.sql 2>&1
 
 #
 # Extra delimiter
@@ -884,8 +884,7 @@
 --exec echo " disconnect test_con1; "                  >> $MYSQLTEST_VARDIR/tmp/con.sql
 --exec echo " dec \$i;                               " >> $MYSQLTEST_VARDIR/tmp/con.sql
 --exec echo "}"                                        >> $MYSQLTEST_VARDIR/tmp/con.sql
---exec echo "source $MYSQLTEST_VARDIR/tmp/con.sql;" | $MYSQL_TEST 2>&1
---exec echo "source var/tmp/con.sql; echo OK;" | $MYSQL_TEST 2>&1
+--exec echo "source $MYSQLTEST_VARDIR/tmp/con.sql; echo OK;" | $MYSQL_TEST 2>&1
 
 # Repeat connect/disconnect, exceed max number of connections
 --exec echo "let \$i=200;"                              > $MYSQLTEST_VARDIR/tmp/con.sql
@@ -1004,26 +1003,26 @@
 #
 # Test zero length result file. Should not pass
 #
---exec touch $MYSQL_TEST_DIR/var/tmp/zero_length_file.result
---exec echo "echo ok;" > $MYSQL_TEST_DIR/var/tmp/query.sql
+--exec touch $MYSQLTEST_VARDIR/tmp/zero_length_file.result
+--exec echo "echo ok;" > $MYSQLTEST_VARDIR/tmp/query.sql
 --error 1
---exec $MYSQL_TEST -x var/tmp/query.sql -R var/tmp/zero_length_file.result  2>&1
+--exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/query.sql -R $MYSQLTEST_VARDIR/tmp/zero_length_file.result  2>&1
 #
 # Test that a test file that does not generate any output fails.
 #
---exec echo "let \$i= 1;" > $MYSQL_TEST_DIR/var/tmp/query.sql
+--exec echo "let \$i= 1;" > $MYSQLTEST_VARDIR/tmp/query.sql
 --error 1
---exec $MYSQL_TEST -x var/tmp/query.sql  2>&1
+--exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/query.sql  2>&1
 
 #
 # Test that mysqltest fails when there are no queries executed
 # but a result file exist
 # NOTE! This will never happen as long as it's not allowed to have
 # test files that does not produce any output
-#--exec echo "something" > $MYSQL_TEST_DIR/var/tmp/result_file.result
-#--exec echo "let \$i= 1;" > $MYSQL_TEST_DIR/var/tmp/query.sql
+#--exec echo "something" > $MYSQLTEST_VARDIR/tmp/result_file.result
+#--exec echo "let \$i= 1;" > $MYSQLTEST_VARDIR/tmp/query.sql
 #--error 1
-#--exec $MYSQL_TEST -x var/tmp/query.sql -R var/tmp/result_file.result 2>&1
+#--exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/query.sql -R $MYSQLTEST_VARDIR/tmp/result_file.result 2>&1
 
 #
 # Bug #11731 mysqltest in multi-statement queries ignores errors in
@@ -1045,13 +1044,9 @@
 drop table t1;
 
 --error 1
---exec $MYSQL_TEST --record -x $MYSQLTEST_VARDIR/tmp/bug11731.sql -R $MYSQLTEST_VARDIR/tmp/bug11731.out
-# The .out file should be empty, cat will fail!
---error 1
---exec cat $MYSQLTEST_VARDIR/tmp/bug11731.out
---exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out 2>&1
+--exec $MYSQL_TEST --record -x $MYSQLTEST_VARDIR/tmp/bug11731.sql -R $MYSQLTEST_VARDIR/tmp/bug11731.out 2>&1
 # The .out file should be non existent
---exec test ! -s $MYSQL_TEST_DIR/var/tmp/bug11731.out
+--exec test ! -s $MYSQLTEST_VARDIR/tmp/bug11731.out
 drop table t1;
 
 
Thread
bk commit into 5.0 tree (msvensson:1.2005)msvensson24 Jan