Merge lp:~laurynas-biveinis/percona-server/bug700965-5.1 into lp:percona-server/5.1

[Laurynas Biveinis]

Fix LP bug 700965: autogenerated files included in the patches.

The build process already regenerates files as necessary. The fix is simply removing the autogenerated files from the patches.

The Jenkins test results are at
http://jenkins.percona.com/job/percona-server-5.1-param/71/
for comparison against latest 5.1 trunk results at
http://jenkins.percona.com/job/percona-server-5.1-trunk/34/

As far as I can tell, the regressions are not related to this change:
http://jenkins.percona.com/job/percona-server-5.1-param/71/BUILD_TYPE=debug-no-Werror,Host=ubuntu-lucid-64bit/console
http://jenkins.percona.com/job/percona-server-5.1-param/71/BUILD_TYPE=debug-no-Werror,Host=ubuntu-lucid-32bit/console
http://jenkins.percona.com/job/percona-server-5.1-param/71/BUILD_TYPE=debug-no-Werror,Host=centos5-32/console
http://jenkins.percona.com/job/percona-server-5.1-param/71/BUILD_TYPE=debug-no-Werror,Host=debian6-64/console

are bug 803865,

http://jenkins.percona.com/job/percona-server-5.1-param/71/BUILD_TYPE=release,Host=ubuntu-maverick-64bit/console: rpl_extra_col_master_myisam is a retry-pass, so looks like an unstable test or Jenkins issue

=== modified file 'bugfix48929.patch'
--- bugfix48929.patch	2011-05-12 11:00:37 +0000
+++ bugfix48929.patch	2011-07-20 09:14:29 +0000
@@ -17,31 +17,6 @@
   stdlib.h stddef.h \
   strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
   sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
-diff -ruN a/configure b/configure
---- a/configure	2010-07-26 18:29:12.172114128 +0900
-+++ b/configure	2010-07-26 20:44:59.199030524 +0900
-@@ -21527,7 +21527,7 @@
- 
- 
- for ac_header in fcntl.h fenv.h float.h floatingpoint.h fpu_control.h \
-- ieeefp.h limits.h memory.h pwd.h select.h \
-+ ieeefp.h limits.h memory.h pwd.h select.h poll.h \
-  stdlib.h stddef.h \
-  strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
-  sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
-diff -ruN a/include/config.h.in b/include/config.h.in
---- a/include/config.h.in	2010-07-26 18:29:12.192113524 +0900
-+++ b/include/config.h.in	2010-07-26 20:46:08.265182869 +0900
-@@ -609,6 +609,9 @@
- /* Define to 1 if you have the `poll' function. */
- #undef HAVE_POLL
- 
-+/* Define to 1 if you have the <poll.h> header file. */
-+#undef HAVE_POLL_H
-+
- /* Define to 1 if you have the `port_create' function. */
- #undef HAVE_PORT_CREATE
- 
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-07-07 03:33:05.278972002 +0400
 +++ b/sql/mysqld.cc	2010-07-07 03:33:05.788972002 +0400

=== modified file 'innodb_show_enhancements.patch'
--- innodb_show_enhancements.patch	2011-03-11 15:25:38 +0000
+++ innodb_show_enhancements.patch	2011-07-20 09:14:29 +0000
@@ -16,17 +16,6 @@
  			mem/mem0dbg.c
  
  EXTRA_LIBRARIES=	libinnobase.a
-diff -ruN a/storage/innodb_plugin/Makefile.in b/storage/innodb_plugin/Makefile.in
---- a/storage/innodb_plugin/Makefile.in	2010-04-06 23:12:58.000000000 +0900
-+++ b/storage/innodb_plugin/Makefile.in	2010-04-29 15:22:39.000000000 +0900
-@@ -782,6 +782,7 @@
- 			include/ut0vec.h	\
- 			include/ut0vec.ic	\
- 			include/ut0wqueue.h	\
-+			handler/innodb_patch_info.h	\
- 			mem/mem0dbg.c
- 
- EXTRA_LIBRARIES = libinnobase.a
 diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-06 23:07:12.000000000 +0900
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-04-29 15:22:39.000000000 +0900

=== modified file 'innodb_swap_builtin_plugin.patch'
--- innodb_swap_builtin_plugin.patch	2011-06-20 06:09:39 +0000
+++ innodb_swap_builtin_plugin.patch	2011-07-20 09:14:29 +0000
@@ -5,115 +5,6 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/configure b/configure
---- a/configure	2010-04-06 23:13:20.000000000 +0900
-+++ b/configure	2010-04-28 19:12:59.000000000 +0900
-@@ -2056,13 +2056,13 @@
-    === InnoDB Storage Engine ===
-   Plugin Name:      innobase
-   Description:      Transactional Tables using InnoDB
--  Supports build:   static and dynamic
-+  Supports build:   dynamic
-   Configurations:   max, max-no-ndb
- 
-    === InnoDB Storage Engine ===
-   Plugin Name:      innodb_plugin
-   Description:      Transactional Tables using InnoDB
--  Supports build:   dynamic
-+  Supports build:   static and dynamic
-   Configurations:   max, max-no-ndb
- 
-    === MyISAM Storage Engine ===
-@@ -42172,7 +42172,8 @@
- 
- 
- 
--      mysql_plugin_innobase=yes
-+      { $as_echo "$as_me:$LINENO: WARNING: InnoDB Storage Engine can only be built as a plugin" >&5
-+$as_echo "$as_me: WARNING: InnoDB Storage Engine can only be built as a plugin" >&2;}
- 
- 
- 
-@@ -42184,8 +42185,7 @@
- 
- 
- 
--      { $as_echo "$as_me:$LINENO: WARNING: InnoDB Storage Engine can only be built as a plugin" >&5
--$as_echo "$as_me: WARNING: InnoDB Storage Engine can only be built as a plugin" >&2;}
-+      mysql_plugin_innodb_plugin=yes
- 
- 
- 
-@@ -43473,7 +43473,7 @@
-     { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
-   else
--
-+    with_plugin_innobase=''
-     if test "X$mysql_plugin_innobase" != Xyes -a \
-             "X$with_plugin_innobase" != Xyes; then
- 
-@@ -43499,20 +43499,11 @@
-     else
- 
- 
--
--         mysql_use_plugin_dir="storage/innobase"
--         mysql_plugin_libs="$mysql_plugin_libs \$(top_builddir)/storage/innobase/libinnobase.a"
--
--
--
--        cat >>confdefs.h <<\_ACEOF
--#define WITH_INNOBASE_STORAGE_ENGINE 1
--_ACEOF
--
--
--       plugin_innobase_static_target="libinnobase.a"
--
--       plugin_innobase_shared_target=""
-+        { $as_echo "$as_me:$LINENO: result: error" >&5
-+$as_echo "error" >&6; }
-+        { { $as_echo "$as_me:$LINENO: error: Plugin innobase does not support static linking" >&5
-+$as_echo "$as_me: error: Plugin innobase does not support static linking" >&2;}
-+   { (exit 1); exit 1; }; }
- 
- 
-       mysql_plugin_defs="$mysql_plugin_defs, builtin_innobase_plugin"
-@@ -43600,7 +43591,7 @@
-     { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
-   else
--    with_plugin_innodb_plugin=''
-+
-     if test "X$mysql_plugin_innodb_plugin" != Xyes -a \
-             "X$with_plugin_innodb_plugin" != Xyes; then
- 
-@@ -43626,11 +43617,20 @@
-     else
- 
- 
--        { $as_echo "$as_me:$LINENO: result: error" >&5
--$as_echo "error" >&6; }
--        { { $as_echo "$as_me:$LINENO: error: Plugin innodb_plugin does not support static linking" >&5
--$as_echo "$as_me: error: Plugin innodb_plugin does not support static linking" >&2;}
--   { (exit 1); exit 1; }; }
-+
-+         mysql_use_plugin_dir="storage/innodb_plugin"
-+         mysql_plugin_libs="$mysql_plugin_libs \$(top_builddir)/storage/innodb_plugin/libinnobase.a"
-+
-+
-+
-+        cat >>confdefs.h <<\_ACEOF
-+#define WITH_INNODB_PLUGIN_STORAGE_ENGINE 1
-+_ACEOF
-+
-+
-+       plugin_innodb_plugin_static_target="libinnobase.a"
-+
-+       plugin_innodb_plugin_shared_target=""
- 
- 
-       mysql_plugin_defs="$mysql_plugin_defs, builtin_innodb_plugin_plugin"
 diff -ruN a/mysql-test/include/have_innodb_plugin.inc b/mysql-test/include/have_innodb_plugin.inc
 --- a/mysql-test/include/have_innodb_plugin.inc	2010-05-07 00:59:10.000000000 +0900
 +++ b/mysql-test/include/have_innodb_plugin.inc	2010-05-25 18:12:49.000000000 +0900

=== modified file 'response-time-distribution.patch'
--- response-time-distribution.patch	2011-06-07 06:24:26 +0000
+++ response-time-distribution.patch	2011-07-20 09:14:29 +0000
@@ -58,44 +58,6 @@
  			sql_base.cc table.cc sql_select.cc sql_insert.cc \
  			sql_profile.cc \
  			sql_prepare.cc sql_error.cc sql_locale.cc \
-diff -ruN a/sql/Makefile.in b/sql/Makefile.in
---- a/sql/Makefile.in	2010-11-01 08:43:52.000000000 +0000
-+++ b/sql/Makefile.in	2010-11-01 08:52:40.000000000 +0000
-@@ -122,7 +122,7 @@
- 	sql_string.$(OBJEXT) sql_manager.$(OBJEXT) sql_map.$(OBJEXT) \
- 	mysqld.$(OBJEXT) password.$(OBJEXT) hash_filo.$(OBJEXT) \
- 	hostname.$(OBJEXT) sql_connect.$(OBJEXT) scheduler.$(OBJEXT) \
--	sql_parse.$(OBJEXT) set_var.$(OBJEXT) sql_yacc.$(OBJEXT) \
-+	sql_parse.$(OBJEXT) set_var.$(OBJEXT) query_response_time.${OBJEXT} sql_yacc.$(OBJEXT) \
- 	sql_base.$(OBJEXT) table.$(OBJEXT) sql_select.$(OBJEXT) \
- 	sql_insert.$(OBJEXT) sql_profile.$(OBJEXT) \
- 	sql_prepare.$(OBJEXT) sql_error.$(OBJEXT) sql_locale.$(OBJEXT) \
-@@ -562,7 +562,7 @@
- 			sql_repl.h slave.h rpl_filter.h rpl_injector.h \
- 			log_event.h rpl_record.h \
- 			log_event_old.h rpl_record_old.h \
--			sql_sort.h sql_cache.h set_var.h \
-+			sql_sort.h sql_cache.h set_var.h query_response_time.h \
- 			spatial.h gstream.h client_settings.h tzfile.h \
- 			tztime.h my_decimal.h\
- 			sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
-@@ -585,7 +585,7 @@
- 			sql_string.cc sql_manager.cc sql_map.cc \
- 			mysqld.cc password.c hash_filo.cc hostname.cc \
- 			sql_connect.cc scheduler.cc sql_parse.cc \
--			set_var.cc sql_yacc.yy \
-+			set_var.cc query_response_time.cc sql_yacc.yy \
- 			sql_base.cc table.cc sql_select.cc sql_insert.cc \
- 			sql_profile.cc \
- 			sql_prepare.cc sql_error.cc sql_locale.cc \
-@@ -828,6 +828,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/password.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procedure.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query_response_time.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/records.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repl_failsafe.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_filter.Po@am__quote@
 diff -ruN a/sql/lex.h b/sql/lex.h
 --- a/sql/lex.h	2010-11-01 08:43:53.000000000 +0000
 +++ b/sql/lex.h	2010-11-01 08:52:40.000000000 +0000

=== modified file 'show_patches.patch'
--- show_patches.patch	2011-05-10 07:31:20 +0000
+++ show_patches.patch	2011-07-20 09:14:29 +0000
@@ -40,28 +40,6 @@
  # We might have some stuff not built in this build, but that we want to install
  install-exec-hook:
  	$(mkinstalldirs) $(DESTDIR)$(libexecdir) $(DESTDIR)$(pkglibdir)
-diff -ruN a/sql/Makefile.in b/sql/Makefile.in
---- a/sql/Makefile.in	2010-04-06 23:12:51.000000000 +0900
-+++ b/sql/Makefile.in	2010-04-28 15:29:36.000000000 +0900
-@@ -630,7 +630,7 @@
- mysql_tzinfo_to_sql_SOURCES = tztime.cc
- mysql_tzinfo_to_sql_CXXFLAGS = -DTZINFO2SQL
- BUILT_MAINT_SRC = sql_yacc.cc sql_yacc.h
--BUILT_SOURCES = $(BUILT_MAINT_SRC) lex_hash.h link_sources
-+BUILT_SOURCES = $(BUILT_MAINT_SRC) lex_hash.h patch_info.h link_sources
- EXTRA_DIST = udf_example.c udf_example.def $(BUILT_MAINT_SRC) \
- 			nt_servc.cc nt_servc.h \
- 			message.mc  message.h message.rc MSG00001.bin \
-@@ -1315,6 +1315,9 @@
- 	test ! -f mysqld-debug.sym.gz   || $(INSTALL_DATA)    mysqld-debug.sym.gz   $(DESTDIR)$(pkglibdir)
- 	test ! -f mysqld.sym.gz         || $(INSTALL_DATA)    mysqld.sym.gz         $(DESTDIR)$(pkglibdir)
- 
-+patch_info.h:	patch_info.h.pl
-+	$(PERL) $< > $@
-+
- # Don't update the files from bitkeeper
- %::SCCS/s.%
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
 diff -ruN a/sql/lex.h b/sql/lex.h
 --- a/sql/lex.h	2010-04-06 23:07:01.000000000 +0900
 +++ b/sql/lex.h	2010-04-28 15:29:36.000000000 +0900

=== modified file 'userstat.patch'
--- userstat.patch	2011-06-08 23:56:48 +0000
+++ userstat.patch	2011-07-20 09:14:29 +0000
@@ -5,18 +5,6 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -ruN a/configure b/configure
---- a/configure	2010-08-27 14:28:05.621275596 +0900
-+++ b/configure	2010-08-27 15:10:33.736074033 +0900
-@@ -38265,7 +38265,7 @@
-   realpath rename rint rwlock_init setupterm \
-   shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \
-   sighold sigset sigthreadmask port_create sleep \
--  snprintf socket stpcpy strcasecmp strerror strsignal strnlen strpbrk strstr \
-+  snprintf socket strsep stpcpy strcasecmp strerror strsignal strnlen strpbrk strstr \
-   strtol strtoll strtoul strtoull tell tempnam thr_setconcurrency vidattr \
-   posix_fallocate backtrace backtrace_symbols backtrace_symbols_fd printstack
- do
 diff -ruN a/configure.in b/configure.in
 --- a/configure.in	2010-10-12 00:34:15.000000000 +0400
 +++ b/configure.in	2010-11-24 18:00:58.000000000 +0300
@@ -47,48 +35,6 @@
  
  AC_SUBST(CLIENT_LIBS)
  AC_SUBST(CLIENT_THREAD_LIBS)
-diff -ruN a/include/config.h.in b/include/config.h.in
---- a/include/config.h.in	2010-10-12 00:39:59.000000000 +0400
-+++ b/include/config.h.in	2010-11-24 17:53:34.000000000 +0300
-@@ -498,6 +498,9 @@
- /* Define to 1 if you have the `pthread' library (-lpthread). */
- #undef HAVE_LIBPTHREAD
- 
-+/* Define to 1 if you have the `rt' library (-lrt). */
-+#undef HAVE_LIBRT
-+
- /* Define if have -lwrap */
- #undef HAVE_LIBWRAP
- 
-@@ -842,6 +845,9 @@
- /* Define to 1 if you have the `strpbrk' function. */
- #undef HAVE_STRPBRK
- 
-+/* Define to 1 if you have the `strsep' function. */
-+#undef HAVE_STRSEP
-+
- /* Define to 1 if you have the `strsignal' function. */
- #undef HAVE_STRSIGNAL
- 
-@@ -863,7 +869,7 @@
- /* Define to 1 if you have the `strtoull' function. */
- #undef HAVE_STRTOULL
- 
--/* Define to 1 if `st_rdev' is member of `struct stat'. */
-+/* Define to 1 if `st_rdev' is a member of `struct stat'. */
- #undef HAVE_STRUCT_STAT_ST_RDEV
- 
- /* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
-@@ -1158,6 +1164,9 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
- 
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
- 
 diff -ruN a/include/mysql/plugin.h b/include/mysql/plugin.h
 --- a/include/mysql/plugin.h	2010-11-24 17:24:51.000000000 +0300
 +++ b/include/mysql/plugin.h	2010-11-24 17:24:52.000000000 +0300