10.0-base merge

5 files changed, 14 insertions, 12 deletions

diff --git a/debian/dist/Debian/mariadb-server-10.0.files b/debian/dist/Debian/mariadb-server-10.0.files
index e910d18805b..6cb4d764660 100644
--- a/debian/dist/Debian/mariadb-server-10.0.files
+++ b/debian/dist/Debian/mariadb-server-10.0.files
@@ -61,4 +61,5 @@ usr/share/mysql/errmsg-utf8.txt
 usr/share/mysql/fill_help_tables.sql
 usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_system_tables.sql
+usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index 6ea5f40acf1..6de5c6603dc 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -84,7 +84,7 @@ build-stamp: configure
 	@echo "RULES.$@"
 	dh_testdir
 
-	cd $(builddir) && $(MAKE) $(MAKE_J)
+	cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS)
 
 ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
 	# Don't know why the following is necessary...
diff --git a/debian/dist/Ubuntu/mariadb-server-10.0.files b/debian/dist/Ubuntu/mariadb-server-10.0.files
index bbee3dfede7..6054ad2d1c5 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.0.files
+++ b/debian/dist/Ubuntu/mariadb-server-10.0.files
@@ -63,4 +63,5 @@ usr/share/mysql/errmsg-utf8.txt
 usr/share/mysql/fill_help_tables.sql
 usr/share/mysql/mysql_system_tables_data.sql
 usr/share/mysql/mysql_system_tables.sql
+usr/share/mysql/mysql_performance_tables.sql
 usr/share/mysql/mysql_test_data_timezone.sql
diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules
index 22fd5fc2620..739cd91dcd8 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -84,7 +84,7 @@ build-stamp: configure
 	@echo "RULES.$@"
 	dh_testdir
 
-	cd $(builddir) && $(MAKE) $(MAKE_J)
+	cd $(builddir) && $(MAKE) $(MAKE_J) $(AM_EXTRA_MAKEFLAGS)
 
 ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
 	# Don't know why the following is necessary...
diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch b/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch
index 4a51eac8a45..81c1baf4375 100755
--- a/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch
+++ b/debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch
@@ -7,18 +7,17 @@
 
 @DPATCH@
 
---- old/scripts/mysqld_safe.sh	2006-07-29 13:12:34.000000000 +0200
-+++ old/scripts/mysqld_safe.sh	2006-07-29 13:14:08.000000000 +0200
-@@ -16,8 +16,6 @@
- # This command can be used as pipe to syslog. With "-s" it also logs to stderr.
- ERR_LOGGER="logger -p daemon.err -t mysqld_safe -i"
+--- a/scripts/mysqld_safe.sh	2013-01-11 16:02:41 +0000
++++ b/scripts/mysqld_safe.sh	2013-01-11 16:03:14 +0000
+@@ -30,7 +30,6 @@
+ syslog_tag_mysqld=mysqld
+ syslog_tag_mysqld_safe=mysqld_safe
  
 -trap '' 1 2 3 15			# we shouldn't let anyone kill us
--
- umask 007
  
- defaults=
-@@ -122,7 +122,7 @@
+ # MySQL-specific environment variable. First off, it's not really a umask,
+ # it's the desired mode. Second, it follows umask(2), not umask(3) in that
+@@ -156,7 +155,7 @@
        # sed buffers output (only GNU sed supports a -u (unbuffered) option)
        # which means that messages may not get sent to syslog until the
        # mysqld process quits.
@@ -27,7 +26,7 @@
        ;;
      *)
        echo "Internal program error (non-fatal):" \
-@@ -352,6 +350,13 @@
+@@ -758,6 +757,13 @@
  fi
  
  #
@@ -41,3 +40,4 @@
  # Uncomment the following lines if you want all tables to be automatically
  # checked and repaired during startup. You should add sensible key_buffer
  # and sort_buffer values to my.cnf to improve check performance or require
+