Updated changelog and refreshed patches after 10.0.22 import

debian/README.Maintainer

@@ -116,6 +116,9 @@ Test that the patches still apply by running:
 
 If there are any rejects, inspect the files and update the patches.
 
+If there are simple offsets we can refresh the patches simply with:
+  quilt pop -a
+  while quilt push; do quilt refresh; done
 
 ### Maintaining debian/copyright ###
 

debian/changelog

-mariadb-10.0 (10.0.21-4) UNRELEASED; urgency=low
+mariadb-10.0 (10.0.22-1) unstable; urgency=low
 
   [ Otto Kekäläinen ]
+  * New upstream release. Includes fixes for the following security
+    vulnerabilities (Closes: #802874):
+    - CVE-2015-4802
+    - CVE-2015-4807
+    - CVE-2015-4815
+    - CVE-2015-4826
+    - CVE-2015-4830
+    - CVE-2015-4836
+    - CVE-2015-4858
+    - CVE-2015-4861
+    - CVE-2015-4870
+    - CVE-2015-4913
+    - CVE-2015-4792
+  * New release includes updated man pages (Closes: #779992)
   * Update the most recent patches with proper DEP-3 compliant headers
   * Add CVE IDs to previous changelog entries
 
   [ Jean Weisbuch ]
   * Update mysqlreport to version 4.0
 
- -- Otto Kekäläinen <otto@seravo.fi>  Mon, 21 Sep 2015 13:18:39 +0300
+ -- Otto Kekäläinen <otto@seravo.fi>  Thu, 29 Oct 2015 23:02:01 +0200
 
 mariadb-10.0 (10.0.21-3) unstable; urgency=low
 

debian/patches/fix-spelling-errors.patch

@@ -15,7 +15,7 @@ Last-Update: 2014-10-02
  
 --- a/man/mysqldump.1
 +++ b/man/mysqldump.1
-@@ -1261,7 +1261,7 @@ to point the slave to the correct master
+@@ -1275,7 +1275,7 @@ to point the slave to the correct master
  .\" max-allowed-packet option: mysqldump
  \fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR
  .sp
@@ -60,7 +60,7 @@ Last-Update: 2014-10-02
  DROP TABLE bookstore;
 --- a/extra/yassl/src/ssl.cpp
 +++ b/extra/yassl/src/ssl.cpp
-@@ -952,7 +952,7 @@ void OpenSSL_add_all_algorithms()  // co
+@@ -979,7 +979,7 @@ void OpenSSL_add_all_algorithms()  // co
  {}
  
  
@@ -95,7 +95,7 @@ Last-Update: 2014-10-02
  44	ru_UA	Russian - Ukraine	8	11	,	.	russian
 --- a/sql/mysqld.cc
 +++ b/sql/mysqld.cc
-@@ -7079,7 +7079,7 @@ struct my_option my_long_options[]=
+@@ -7097,7 +7097,7 @@ struct my_option my_long_options[]=
     &opt_show_slave_auth_info, &opt_show_slave_auth_info, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
    {"skip-bdb", OPT_DEPRECATED_OPTION,
@@ -104,7 +104,7 @@ Last-Update: 2014-10-02
     0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
  #ifndef DISABLE_GRANT_OPTIONS
    {"skip-grant-tables", 0,
-@@ -8372,7 +8372,7 @@ mysqld_get_one_option(int optid,
+@@ -8390,7 +8390,7 @@ mysqld_get_one_option(int optid,
      break;
    case OPT_DEPRECATED_OPTION:
      sql_print_warning("'%s' is deprecated. It does nothing and exists only "

debian/patches/mysql-test__db_test.patch

@@ -6,7 +6,7 @@
 ## DP: suite depends on them.
 --- a/mysql-test/mysql-test-run.pl
 +++ b/mysql-test/mysql-test-run.pl
-@@ -3605,6 +3605,11 @@ sub mysql_install_db {
+@@ -3603,6 +3603,11 @@ sub mysql_install_db {
      mtr_appendfile_to_file("$sql_dir/mysql_system_tables_data.sql",
  			   $bootstrap_sql_file);
  

debian/patches/scripts__mysql_install_db.sh__no_test.patch

@@ -6,7 +6,7 @@
 
 --- a/scripts/mysql_install_db.sh
 +++ b/scripts/mysql_install_db.sh
-@@ -372,7 +372,7 @@ then
+@@ -374,7 +374,7 @@ then
  fi
  
  # Create database directories