bk commit into 5.0 tree (msvensson:1.2506) BUG#28373

[msvensson]

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@stripped, 2007-05-31 15:58:22+02:00, msvensson@pilot.(none) +2 -0
  Bug#28373 mysqltest test case fails with binlog disabled
   - Update tests to be independent how the mysqld was started

  mysql-test/r/mysqltest.result@stripped, 2007-05-31 15:58:21+02:00, msvensson@pilot.(none) +0 -1
    Update result file

  mysql-test/t/mysqltest.test@stripped, 2007-05-31 15:58:21+02:00, msvensson@pilot.(none) +2 -4
    The purpose of these three test is to check that "sync_with_master"
    detects illegal parameters, the parameter checking is done before
    sending any command to the server and the "save_master_pos" can be
    removed in two cases to make the tests independent of mysqld.
    The thirs test is removed since it's a syntax check that is done
    after the command has been executed and is done for all comands in
    mysqltest - it's tested elsewhere and is not specific to "sync_with_master"  

# 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:	pilot.(none)
# Root:	/data/msvensson/mysql/bug28373/my50-bug28373

--- 1.47/mysql-test/r/mysqltest.result	2007-05-18 12:56:25 +02:00
+++ 1.48/mysql-test/r/mysqltest.result	2007-05-31 15:58:21 +02:00
@@ -410,7 +410,6 @@
 mysqltest: At line 1: Wrong column number to replace_column in 'replace_column a 1'
 mysqltest: At line 1: Wrong column number to replace_column in 'replace_column 1 b c '
 mysqltest: At line 1: Invalid integer argument "10!"
-mysqltest: At line 1: End of line junk detected: "!"
 mysqltest: At line 1: Invalid integer argument "a"
 mysqltest: At line 1: Missing required argument 'connection name' to command 'connect'
 mysqltest: At line 1: Missing required argument 'connection name' to command 'connect'

--- 1.56/mysql-test/t/mysqltest.test	2007-05-18 12:56:50 +02:00
+++ 1.57/mysql-test/t/mysqltest.test	2007-05-31 15:58:21 +02:00
@@ -1227,11 +1227,9 @@
 # Test sync_with_master
 # ----------------------------------------------------------------------------
 --error 1
---exec echo "save_master_pos; sync_with_master 10!;" | $MYSQL_TEST 2>&1
+--exec echo "sync_with_master 10!;" | $MYSQL_TEST 2>&1
 --error 1
---exec echo "save_master_pos; sync_with_master 10 !;" | $MYSQL_TEST 2>&1
---error 1
---exec echo "save_master_pos; sync_with_master a;" | $MYSQL_TEST 2>&1
+--exec echo "sync_with_master a;" | $MYSQL_TEST 2>&1
 
 # ----------------------------------------------------------------------------
 # Test connect