Merge lp:~tsarev/percona-server/fix_bug_700965 into lp:percona-server/rnt-5.1

[Oleg Tsarev]

[Oleg Tsarev (tsarev)]

    remove references to Makefile.in from mwl36.patch and wl5151.patch

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'patches/mwl36.patch'
--- patches/mwl36.patch	2011-08-14 17:59:20 +0000
+++ patches/mwl36.patch	2011-09-16 14:15:52 +0000
@@ -35,18 +35,6 @@
  strings_src=decimal.c
  
  link_sources:
---- a/client/Makefile.in
-+++ b/client/Makefile.in
-@@ -548,7 +548,8 @@
- 	rpl_utility.h rpl_tblmap.h rpl_tblmap.cc \
- 	log_event.cc my_decimal.h my_decimal.cc \
- 	log_event_old.h log_event_old.cc \
--	rpl_record_old.h rpl_record_old.cc
-+	rpl_record_old.h rpl_record_old.cc \
-+	sql_list.h rpl_filter.h sql_list.cc rpl_filter.cc
- 
- strings_src = decimal.c
- all: $(BUILT_SOURCES)
 --- a/client/mysqlbinlog.cc
 +++ b/client/mysqlbinlog.cc
 @@ -35,6 +35,15 @@

=== modified file 'patches/wl5151.patch'
--- patches/wl5151.patch	2011-08-14 17:59:20 +0000
+++ patches/wl5151.patch	2011-09-16 14:15:52 +0000
@@ -20,21 +20,6 @@
          sql_list.h rpl_filter.h sql_list.cc rpl_filter.cc
  strings_src=decimal.c
  
---- a/client/Makefile.in
-+++ b/client/Makefile.in
-@@ -545,10 +545,11 @@
-                                 $(top_srcdir)/mysys/my_getpagesize.c
- 
- sql_src = log_event.h mysql_priv.h rpl_constants.h \
--	rpl_utility.h rpl_tblmap.h rpl_tblmap.cc \
-+	rpl_tblmap.h rpl_tblmap.cc \
- 	log_event.cc my_decimal.h my_decimal.cc \
- 	log_event_old.h log_event_old.cc \
- 	rpl_record_old.h rpl_record_old.cc \
-+	rpl_utility.h rpl_utility.cc \
- 	sql_list.h rpl_filter.h sql_list.cc rpl_filter.cc
- 
- strings_src = decimal.c
 --- a/client/mysqlbinlog.cc
 +++ b/client/mysqlbinlog.cc
 @@ -2391,4 +2391,4 @@