Refresh patches for MariaDB 10.1.30

ccf02946 · Otto Kekäläinen · 14d49fce · ccf02946 · ccf02946 · ccf02946
Commit ccf02946 authored Dec 28, 2017 by Otto Kekäläinen
--- a/debian/patches/Add_default_ExecStartPre_to_mariadb@.service.patch
+++ b/debian/patches/Add_default_ExecStartPre_to_mariadb@.service.patch
@@ -10,7 +10,7 @@ diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.
 index 02be006..183b68b 100644
 --- a/support-files/mariadb@.service.in
 +++ b/support-files/mariadb@.service.in
-@@ -65,6 +65,8 @@ ProtectHome=true
+@@ -67,6 +67,8 @@ ProtectHome=true
 # Execute pre and post scripts as root, otherwise it does it as User=
 PermissionsStartOnly=true
 

--- a/debian/patches/c11_atomics.patch
+++ b/debian/patches/c11_atomics.patch
@@ -125,7 +125,7 @@ diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
 index b4acac5..8247714 100644
 --- a/sql/CMakeLists.txt
 +++ b/sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS}
+@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
   ${SSL_LIBRARIES}
   ${LIBSYSTEMD})
 

--- a/debian/patches/libmariadbclient-rename.patch
+++ b/debian/patches/libmariadbclient-rename.patch
@@ -214,7 +214,7 @@ index 47e8a3a..c699974 100644
 library\&. The options returned are tied to the specific compiler that was used when the library was created and might clash with the settings for your own compiler\&. Use
 \fB\-\-include\fR
 for more portable options that contain only include paths\&.
-@@ -196,9 +196,9 @@ Usage: /usr/local/mysql/bin/mysql_config [options]
+@@ -196,9 +196,9 @@ Usage: /usr/local/mysql/bin/mysql_config
 Options:
   \-\-cflags         [\-I/usr/local/mysql/include/mysql \-mcpu=pentiumpro]
   \-\-include        [\-I/usr/local/mysql/include/mysql]
@@ -239,7 +239,7 @@ index 2415d40..bfff308 100755
    mysys/$TARGET/mysys.lib \
    regex/$TARGET/regex.lib \
    strings/$TARGET/strings.lib \
-@@ -302,7 +302,7 @@ cp storage/*/$TARGET/ha_*.dll $DESTDIR/lib/plugin/
+@@ -302,7 +302,7 @@ cp storage/*/$TARGET/ha_*.dll $DESTDIR/l
 
 if [ x"$TARGET" != x"release" ] ; then
   cp libmysql/$TARGET/libmysql.pdb \
@@ -248,7 +248,7 @@ index 2415d40..bfff308 100755
      mysys/$TARGET/mysys.pdb \
      regex/$TARGET/regex.pdb \
      strings/$TARGET/strings.pdb \
-@@ -318,8 +318,8 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
+@@ -318,8 +318,8 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysq
   cp libmysql/debug/libmysql.dll \
      libmysql/debug/libmysql.lib \
      libmysql/debug/libmysql.pdb \
@@ -314,7 +314,7 @@ diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt
 index ad5195a..965df3c 100644
 --- a/unittest/mysys/CMakeLists.txt
 +++ b/unittest/mysys/CMakeLists.txt
-@@ -21,7 +21,7 @@ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+@@ -21,7 +21,7 @@ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES
 ADD_DEFINITIONS(${SSL_DEFINES})
 
 MY_ADD_TESTS(ma_dyncol

--- a/debian/patches/mips-connect-unaligned.patch
+++ b/debian/patches/mips-connect-unaligned.patch
@@ -11,7 +11,7 @@ diff --git a/storage/connect/valblk.cpp b/storage/connect/valblk.cpp
 index 018c7ee..d32f804 100644
 --- a/storage/connect/valblk.cpp
 +++ b/storage/connect/valblk.cpp
-@@ -266,14 +266,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool check)
+@@ -266,14 +266,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
 template <class TYPE>
 char *TYPBLK<TYPE>::GetCharString(char *p, int n)
   {
@@ -28,7 +28,7 @@ index 018c7ee..d32f804 100644
   return p;
   } // end of GetCharString
 
-@@ -289,7 +289,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, int n)
+@@ -289,7 +289,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
   ChkTyp(valp);
 
   if (!(b = valp->IsNull()))
@@ -37,7 +37,7 @@ index 018c7ee..d32f804 100644
   else
     Reset(n);
 
-@@ -351,9 +351,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int n)
+@@ -351,9 +351,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
     
   if (minus && val < maxval)
@@ -49,7 +49,7 @@ index 018c7ee..d32f804 100644
 
   SetNull(n, false);
   } // end of SetValue
-@@ -396,7 +396,7 @@ void TYPBLK<double>::SetValue(PCSZ p, int n)
+@@ -396,7 +396,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
 		throw Type;
 	} // endif Check
 
@@ -58,7 +58,7 @@ index 018c7ee..d32f804 100644
   SetNull(n, false);
   } // end of SetValue
 
-@@ -428,7 +428,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, int n1, int n2)
+@@ -428,7 +428,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
   ChkTyp(pv);
 
   if (!(b = pv->IsNull(n2) && Nullable))
@@ -67,7 +67,7 @@ index 018c7ee..d32f804 100644
   else
     Reset(n1);
 
-@@ -479,10 +479,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int n)
+@@ -479,10 +479,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
   {
   CheckParms(valp, n)
   TYPE  tval = GetTypedValue(valp);
@@ -80,7 +80,7 @@ index 018c7ee..d32f804 100644
 
   } // end of SetMin
 
-@@ -494,10 +494,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int n)
+@@ -494,10 +494,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
   {
   CheckParms(valp, n)
   TYPE  tval = GetTypedValue(valp);
@@ -93,7 +93,7 @@ index 018c7ee..d32f804 100644
 
   } // end of SetMax
 
-@@ -511,8 +511,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, int k, int n)
+@@ -511,8 +511,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
   CheckType(pv)
   TYPE *lp = ((TYPBLK*)pv)->Typp;
 
@@ -103,7 +103,7 @@ index 018c7ee..d32f804 100644
 
   } // end of SetValues
 #endif // 0
-@@ -523,7 +522,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, int k, int n)
+@@ -523,7 +522,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
 template <class TYPE>
 void TYPBLK<TYPE>::Move(int i, int j)
   {
@@ -112,7 +112,7 @@ index 018c7ee..d32f804 100644
   MoveNull(i, j);
   } // end of Move
 
-@@ -537,7 +536,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n)
+@@ -537,7 +536,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
   ChkIndx(n);
   ChkTyp(vp);
 #endif   // _DEBUG
@@ -121,7 +121,7 @@ index 018c7ee..d32f804 100644
   TYPE vlv = GetTypedValue(vp);
 
   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -549,8 +548,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n)
+@@ -549,8 +548,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
 template <class TYPE>
 int TYPBLK<TYPE>::CompVal(int i1, int i2)
   {
@@ -150,7 +150,7 @@ index 018c7ee..d32f804 100644
     n = MY_MAX(n, m);
     } // endfor i
 
-@@ -1333,7 +1332,7 @@ char *DATBLK::GetCharString(char *p, int n)
+@@ -1333,7 +1332,7 @@ char *DATBLK::GetCharString(char *p, int
   char *vp;
 
   if (Dvalp) {

--- a/debian/patches/mytop-merge_src:mytop_improvements.patch
+++ b/debian/patches/mytop-merge_src:mytop_improvements.patch
@@ -10,7 +10,7 @@ diff --git a/scripts/mytop.sh b/scripts/mytop.sh
 index 17a87e9..e8cc902 100644
 --- a/scripts/mytop.sh
 +++ b/scripts/mytop.sh
-@@ -15,6 +15,7 @@ mytop - display MariaDB server performance info like `top'
+@@ -15,6 +15,7 @@ mytop - display MariaDB server performan
 use 5.005;
 use strict;
 use DBI;
@@ -36,7 +36,7 @@ index 17a87e9..e8cc902 100644
     port          => 3306,
     resolve       => 0,
     slow	  => 10,	# slow query time
-@@ -125,6 +128,37 @@ if (!defined($my_print_defaults=my_which("my_print_defaults")))
+@@ -125,6 +128,37 @@ if (!defined($my_print_defaults=my_which
 
 unshift @ARGV, split "\n", `$my_print_defaults client mytop`;
 
@@ -261,7 +261,7 @@ index 17a87e9..e8cc902 100644
 
     open P, "|$config{pager}" or die "$!";
     print keys %{$data[0]};
-@@ -1722,7 +1770,7 @@ Help for mytop version $main::VERSION by Jeremy D. Zawodny <${YELLOW}Jeremy\@Zaw
+@@ -1722,7 +1770,7 @@ Help for mytop version $main::VERSION by
   e - explain the query that a thread is running
   E - display current replication error
   f - show full query info for a given thread
@@ -270,7 +270,7 @@ index 17a87e9..e8cc902 100644
   h - show only a specifc host's connections
   H - toggle the mytop header
   i - toggle the display of idle (sleeping) threads
-@@ -1737,7 +1785,7 @@ Help for mytop version $main::VERSION by Jeremy D. Zawodny <${YELLOW}Jeremy\@Zaw
+@@ -1737,7 +1785,7 @@ Help for mytop version $main::VERSION by
   r - reset the status counters (via FLUSH STATUS on your server)
   R - change reverse IP lookup
   s - change the delay between screen updates
@@ -279,7 +279,7 @@ index 17a87e9..e8cc902 100644
   t - switch to thread view (default)
   u - show only a specific user
   V - show variables
-@@ -1745,7 +1793,7 @@ Help for mytop version $main::VERSION by Jeremy D. Zawodny <${YELLOW}Jeremy\@Zaw
+@@ -1745,7 +1793,7 @@ Help for mytop version $main::VERSION by
   ! - Skip an error that has stopped replications (at your own risk)
   L - show full queries (do not strip to terminal width)
 
@@ -307,7 +307,7 @@ index 17a87e9..e8cc902 100644
 
 This version comes as part of the B<MariaDB> distribution. See B<http://mariadb.org/>.
 
-@@ -1875,6 +1926,7 @@ In order for B<mytop> to function properly, you must have the
+@@ -1875,6 +1926,7 @@ In order for B<mytop> to function proper
 following:
 
   * Perl 5.005 or newer
@@ -315,7 +315,7 @@ index 17a87e9..e8cc902 100644
   * Getopt::Long
   * DBI and DBD::mysql
   * Term::ReadKey from CPAN
-@@ -2016,46 +2068,49 @@ have two dashes `--'. Short arguments only have one '-'.
+@@ -2016,46 +2068,49 @@ have two dashes `--'. Short arguments on
 
 =over
 
@@ -437,7 +437,7 @@ index 17a87e9..e8cc902 100644
 =head2 Shortcut Keys
 
 The following keys perform various actions while B<mytop> is
-@@ -2204,8 +2287,8 @@ running queries appear at the top of the list.
+@@ -2204,8 +2287,8 @@ running queries appear at the top of the
 
 =item B<I>
 
@@ -459,7 +459,7 @@ index 17a87e9..e8cc902 100644
 
 =head1 BUGS
 
-@@ -2292,9 +2375,6 @@ width. If you have fairly long database/user/host names the display
+@@ -2292,9 +2375,6 @@ width. If you have fairly long database/
 may appear odd. I have no good idea as to how best to deal with that
 yet. Suggestions are welcome.
 

--- a/debian/patches/remove-systemd-obsolete-target.patch
+++ b/debian/patches/remove-systemd-obsolete-target.patch
@@ -11,9 +11,9 @@ diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
 index 6a307b2..7f40583 100644
 --- a/support-files/mariadb.service.in
 +++ b/support-files/mariadb.service.in
-@@ -15,7 +15,6 @@
- [Unit]
- Description=MariaDB database server
+@@ -17,7 +17,6 @@ Description=MariaDB @VERSION@ database s
+ Documentation=man:mysqld(8)
+ Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
 -After=syslog.target
 
@@ -23,9 +23,9 @@ diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.
 index 410e743..02be006 100644
 --- a/support-files/mariadb@.service.in
 +++ b/support-files/mariadb@.service.in
-@@ -20,7 +20,6 @@
- [Unit]
- Description=MariaDB database server
+@@ -22,7 +22,6 @@ Description=MariaDB @VERSION@ database s
+ Documentation=man:mysqld(8)
+ Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
 -After=syslog.target