From 42deaca6114bad0d9782a14b267ac79cf5984d63 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.(none)" <>
Date: Thu, 31 May 2007 15:58:22 +0200
Subject: [PATCH] Bug#28373 mysqltest test case fails with binlog disabled  -
 Update tests to be independent how the mysqld was started

---
 mysql-test/r/mysqltest.result | 1 -
 mysql-test/t/mysqltest.test   | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 35dcf9b62d..7ae17c254e 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -410,7 +410,6 @@ mysqltest: At line 1: Wrong column number to replace_column in 'replace_column a
 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'
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 057432d37f..702ea2106f 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -1227,11 +1227,9 @@ select "a" as col1, "c" as col2;
 # 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
-- 
2.30.9