Misc: Debian patches update

debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch

@@ -10,16 +10,15 @@
 @DPATCH@
 --- a/scripts/mysql_system_tables_data.sql
 +++ b/scripts/mysql_system_tables_data.sql
-@@ -26,16 +26,6 @@
- -- a plain character
+@@ -27,15 +27,6 @@
  SELECT LOWER( REPLACE((SELECT REPLACE(@@hostname,'_','\_')),'%','\%') )INTO @current_hostname;
  
--
+
 --- Fill "db" table with default grants for anyone to
 --- access database 'test' and 'test_%' if "db" table didn't exist
 -CREATE TEMPORARY TABLE tmp_db LIKE db;
--INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
--INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');
+-INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y','Y');
 -INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
 -DROP TABLE tmp_db;
 -
@@ -27,10 +26,10 @@
  -- Fill "user" table with default users allowing root access
  -- from local machine if "user" table didn't exist before
  CREATE TEMPORARY TABLE tmp_user_nopasswd LIKE user;
-@@ -48,9 +38,6 @@ REPLACE INTO tmp_user_nopasswd VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y'
- REPLACE INTO tmp_user_nopasswd VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N', '', 0);
+@@ -48,9 +39,6 @@ REPLACE INTO tmp_user_nopasswd VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y'
+ REPLACE INTO tmp_user_nopasswd VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N', '', 0);
  -- More secure root account using unix sucket auth.
- INSERT INTO tmp_user_socket VALUES ('localhost',IFNULL(@auth_root_socket, 'root'),'','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'unix_socket','','N', 'N','', 0);
+ INSERT INTO tmp_user_socket VALUES ('localhost',IFNULL(@auth_root_socket, 'root'),'','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'unix_socket','','N', 'N','', 0);
 --- Anonymous user with no privileges.
 -INSERT INTO tmp_user_anonymous (host,user) VALUES ('localhost','');
 -INSERT INTO tmp_user_anonymous (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';

debian/patches/38_scripts__mysqld_safe.sh__signals.dpatch

@@ -7,9 +7,9 @@
 
 @DPATCH@
 
---- a/scripts/mysqld_safe.sh	2013-01-11 16:02:41 +0000
-+++ b/scripts/mysqld_safe.sh	2013-01-11 16:03:14 +0000
-@@ -32,7 +32,6 @@ err_log=
+--- a/scripts/mysqld_safe.sh   2013-01-11 16:02:41 +0000
++++ b/scripts/mysqld_safe.sh   2013-01-11 16:03:14 +0000
+@@ -36,7 +36,6 @@ skip_err_log=0
  syslog_tag_mysqld=mysqld
  syslog_tag_mysqld_safe=mysqld_safe
  
@@ -17,7 +17,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
-@@ -163,7 +162,7 @@ eval_log_error () {
+@@ -181,7 +180,7 @@ eval_log_error () {
        # 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.
@@ -26,7 +26,7 @@
        ;;
      *)
        echo "Internal program error (non-fatal):" \
-@@ -805,6 +804,13 @@ then
+@@ -895,6 +894,13 @@ then
  fi
  
  #

debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch

@@ -7,9 +7,9 @@
 
 @DPATCH@
 
---- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh	2008-01-29 22:41:20.000000000 +0100
-+++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh	2008-02-28 10:08:11.000000000 +0100
-@@ -372,7 +372,7 @@ then
+--- mysql-dfsg-5.1-5.1.23rc.orig/scripts/mysql_install_db.sh   2008-01-29 22:41:20.000000000 +0100
++++ mysql-dfsg-5.1-5.1.23rc/scripts/mysql_install_db.sh        2008-02-28 10:08:11.000000000 +0100
+@@ -407,7 +407,7 @@ then
  fi
  
  # Create database directories

debian/patches/50_mysql-test__db_test.dpatch

@@ -8,9 +8,9 @@
 
 @DPATCH@
 
---- old/mysql-test/mysql-test-run.pl	2009-06-16 14:24:09.000000000 +0200
-+++ new/mysql-test/mysql-test-run.pl	2009-07-04 00:03:34.000000000 +0200
-@@ -3578,6 +3578,11 @@ sub mysql_install_db {
+--- old/mysql-test/mysql-test-run.pl   2009-06-16 14:24:09.000000000 +0200
++++ new/mysql-test/mysql-test-run.pl   2009-07-04 00:03:34.000000000 +0200
+@@ -3180,6 +3180,11 @@ sub mysql_install_db {
        mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
             $bootstrap_sql_file);