From 8e9d7bc6bc35241e78faea574db372c4920f1027 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Tue, 25 Nov 2003 20:06:41 +0100
Subject: [PATCH] post-merge fixes

Makefile.am:
  spurious space (from a bad merge) deleted
mysql-test/r/rpl_change_master.result:
  test results updated
---
 Makefile.am                           | 2 +-
 mysql-test/r/rpl_change_master.result | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c330471169d..6afbce11dfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS =	foreign
 
 # These are built from source in the Docs directory
 EXTRA_DIST =		INSTALL-SOURCE README COPYING zlib
-SUBDIRS =		. include @docs_dirs@ \ 
+SUBDIRS =		. include @docs_dirs@ \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack @sql_client_dirs@ \
 			@sql_server_dirs@ scripts man tests \
diff --git a/mysql-test/r/rpl_change_master.result b/mysql-test/r/rpl_change_master.result
index 546a0ee2710..a6342d47b49 100644
--- a/mysql-test/r/rpl_change_master.result
+++ b/mysql-test/r/rpl_change_master.result
@@ -8,7 +8,7 @@ select get_lock("a",5);
 get_lock("a",5)
 1
 create table t1(n int);
-insert into t1 values(1+get_lock("a",10)*0);
+insert into t1 values(1+get_lock("a",15)*0);
 insert into t1 values(2);
 stop slave;
 select * from t1;