Skip to content
GitLab
Commit ccf02946 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Refresh patches for MariaDB 10.1.30

parent 14d49fce
Hide whitespace changes
Inline Side-by-side
debian/patches/Add_default_ExecStartPre_to_mariadb@.service.patch
View file @ ccf02946
...@@ -10,7 +10,7 @@ diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service. ...@@ -10,7 +10,7 @@ diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.
index 02be006..183b68b 100644 index 02be006..183b68b 100644
--- a/support-files/mariadb@.service.in --- a/support-files/mariadb@.service.in
+++ b/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= # Execute pre and post scripts as root, otherwise it does it as User=
PermissionsStartOnly=true PermissionsStartOnly=true
......
debian/patches/c11_atomics.patch
View file @ ccf02946
...@@ -125,7 +125,7 @@ diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt ...@@ -125,7 +125,7 @@ diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index b4acac5..8247714 100644 index b4acac5..8247714 100644
--- a/sql/CMakeLists.txt --- a/sql/CMakeLists.txt
+++ b/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} ${SSL_LIBRARIES}
${LIBSYSTEMD}) ${LIBSYSTEMD})
......
debian/patches/libmariadbclient-rename.patch
View file @ ccf02946
...@@ -214,7 +214,7 @@ index 47e8a3a..c699974 100644 ...@@ -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 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 \fB\-\-include\fR
for more portable options that contain only include paths\&. 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: Options:
\-\-cflags [\-I/usr/local/mysql/include/mysql \-mcpu=pentiumpro] \-\-cflags [\-I/usr/local/mysql/include/mysql \-mcpu=pentiumpro]
\-\-include [\-I/usr/local/mysql/include/mysql] \-\-include [\-I/usr/local/mysql/include/mysql]
...@@ -239,7 +239,7 @@ index 2415d40..bfff308 100755 ...@@ -239,7 +239,7 @@ index 2415d40..bfff308 100755
mysys/$TARGET/mysys.lib \ mysys/$TARGET/mysys.lib \
regex/$TARGET/regex.lib \ regex/$TARGET/regex.lib \
strings/$TARGET/strings.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 if [ x"$TARGET" != x"release" ] ; then
cp libmysql/$TARGET/libmysql.pdb \ cp libmysql/$TARGET/libmysql.pdb \
...@@ -248,7 +248,7 @@ index 2415d40..bfff308 100755 ...@@ -248,7 +248,7 @@ index 2415d40..bfff308 100755
mysys/$TARGET/mysys.pdb \ mysys/$TARGET/mysys.pdb \
regex/$TARGET/regex.pdb \ regex/$TARGET/regex.pdb \
strings/$TARGET/strings.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 \ cp libmysql/debug/libmysql.dll \
libmysql/debug/libmysql.lib \ libmysql/debug/libmysql.lib \
libmysql/debug/libmysql.pdb \ libmysql/debug/libmysql.pdb \
...@@ -314,7 +314,7 @@ diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt ...@@ -314,7 +314,7 @@ diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt
index ad5195a..965df3c 100644 index ad5195a..965df3c 100644
--- a/unittest/mysys/CMakeLists.txt --- a/unittest/mysys/CMakeLists.txt
+++ b/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}) ADD_DEFINITIONS(${SSL_DEFINES})
MY_ADD_TESTS(ma_dyncol MY_ADD_TESTS(ma_dyncol
......
debian/patches/mips-connect-unaligned.patch
View file @ ccf02946
...@@ -11,7 +11,7 @@ diff --git a/storage/connect/valblk.cpp b/storage/connect/valblk.cpp ...@@ -11,7 +11,7 @@ diff --git a/storage/connect/valblk.cpp b/storage/connect/valblk.cpp
index 018c7ee..d32f804 100644 index 018c7ee..d32f804 100644
--- a/storage/connect/valblk.cpp --- a/storage/connect/valblk.cpp
+++ b/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> template <class TYPE>
char *TYPBLK<TYPE>::GetCharString(char *p, int n) char *TYPBLK<TYPE>::GetCharString(char *p, int n)
{ {
...@@ -28,7 +28,7 @@ index 018c7ee..d32f804 100644 ...@@ -28,7 +28,7 @@ index 018c7ee..d32f804 100644
return p; return p;
} // end of GetCharString } // 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); ChkTyp(valp);
if (!(b = valp->IsNull())) if (!(b = valp->IsNull()))
...@@ -37,7 +37,7 @@ index 018c7ee..d32f804 100644 ...@@ -37,7 +37,7 @@ index 018c7ee..d32f804 100644
else else
Reset(n); 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); ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus);
if (minus && val < maxval) if (minus && val < maxval)
...@@ -49,7 +49,7 @@ index 018c7ee..d32f804 100644 ...@@ -49,7 +49,7 @@ index 018c7ee..d32f804 100644
SetNull(n, false); SetNull(n, false);
} // end of SetValue } // 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; throw Type;
} // endif Check } // endif Check
...@@ -58,7 +58,7 @@ index 018c7ee..d32f804 100644 ...@@ -58,7 +58,7 @@ index 018c7ee..d32f804 100644
SetNull(n, false); SetNull(n, false);
} // end of SetValue } // 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); ChkTyp(pv);
if (!(b = pv->IsNull(n2) && Nullable)) if (!(b = pv->IsNull(n2) && Nullable))
...@@ -67,7 +67,7 @@ index 018c7ee..d32f804 100644 ...@@ -67,7 +67,7 @@ index 018c7ee..d32f804 100644
else else
Reset(n1); 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) CheckParms(valp, n)
TYPE tval = GetTypedValue(valp); TYPE tval = GetTypedValue(valp);
...@@ -80,7 +80,7 @@ index 018c7ee..d32f804 100644 ...@@ -80,7 +80,7 @@ index 018c7ee..d32f804 100644
} // end of SetMin } // 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) CheckParms(valp, n)
TYPE tval = GetTypedValue(valp); TYPE tval = GetTypedValue(valp);
...@@ -93,7 +93,7 @@ index 018c7ee..d32f804 100644 ...@@ -93,7 +93,7 @@ index 018c7ee..d32f804 100644
} // end of SetMax } // 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) CheckType(pv)
TYPE *lp = ((TYPBLK*)pv)->Typp; TYPE *lp = ((TYPBLK*)pv)->Typp;
...@@ -103,7 +103,7 @@ index 018c7ee..d32f804 100644 ...@@ -103,7 +103,7 @@ index 018c7ee..d32f804 100644
} // end of SetValues } // end of SetValues
#endif // 0 #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> template <class TYPE>
void TYPBLK<TYPE>::Move(int i, int j) void TYPBLK<TYPE>::Move(int i, int j)
{ {
...@@ -112,7 +112,7 @@ index 018c7ee..d32f804 100644 ...@@ -112,7 +112,7 @@ index 018c7ee..d32f804 100644
MoveNull(i, j); MoveNull(i, j);
} // end of Move } // 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); ChkIndx(n);
ChkTyp(vp); ChkTyp(vp);
#endif // _DEBUG #endif // _DEBUG
...@@ -121,7 +121,7 @@ index 018c7ee..d32f804 100644 ...@@ -121,7 +121,7 @@ index 018c7ee..d32f804 100644
TYPE vlv = GetTypedValue(vp); TYPE vlv = GetTypedValue(vp);
return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0; 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> template <class TYPE>
int TYPBLK<TYPE>::CompVal(int i1, int i2) int TYPBLK<TYPE>::CompVal(int i1, int i2)
{ {
...@@ -150,7 +150,7 @@ index 018c7ee..d32f804 100644 ...@@ -150,7 +150,7 @@ index 018c7ee..d32f804 100644
n = MY_MAX(n, m); n = MY_MAX(n, m);
} // endfor i } // 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; char *vp;
if (Dvalp) { if (Dvalp) {
......
debian/patches/mytop-merge_src:mytop_improvements.patch
View file @ ccf02946
...@@ -10,7 +10,7 @@ diff --git a/scripts/mytop.sh b/scripts/mytop.sh ...@@ -10,7 +10,7 @@ diff --git a/scripts/mytop.sh b/scripts/mytop.sh
index 17a87e9..e8cc902 100644 index 17a87e9..e8cc902 100644
--- a/scripts/mytop.sh --- a/scripts/mytop.sh
+++ b/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 5.005;
use strict; use strict;
use DBI; use DBI;
...@@ -36,7 +36,7 @@ index 17a87e9..e8cc902 100644 ...@@ -36,7 +36,7 @@ index 17a87e9..e8cc902 100644
port => 3306, port => 3306,
resolve => 0, resolve => 0,
slow => 10, # slow query time 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`; unshift @ARGV, split "\n", `$my_print_defaults client mytop`;
...@@ -261,7 +261,7 @@ index 17a87e9..e8cc902 100644 ...@@ -261,7 +261,7 @@ index 17a87e9..e8cc902 100644
open P, "|$config{pager}" or die "$!"; open P, "|$config{pager}" or die "$!";
print keys %{$data[0]}; 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 - explain the query that a thread is running
E - display current replication error E - display current replication error
f - show full query info for a given thread f - show full query info for a given thread
...@@ -270,7 +270,7 @@ index 17a87e9..e8cc902 100644 ...@@ -270,7 +270,7 @@ index 17a87e9..e8cc902 100644
h - show only a specifc host's connections h - show only a specifc host's connections
H - toggle the mytop header H - toggle the mytop header
i - toggle the display of idle (sleeping) threads 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 - reset the status counters (via FLUSH STATUS on your server)
R - change reverse IP lookup R - change reverse IP lookup
s - change the delay between screen updates s - change the delay between screen updates
...@@ -279,7 +279,7 @@ index 17a87e9..e8cc902 100644 ...@@ -279,7 +279,7 @@ index 17a87e9..e8cc902 100644
t - switch to thread view (default) t - switch to thread view (default)
u - show only a specific user u - show only a specific user
V - show variables 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) ! - Skip an error that has stopped replications (at your own risk)
L - show full queries (do not strip to terminal width) L - show full queries (do not strip to terminal width)
...@@ -307,7 +307,7 @@ index 17a87e9..e8cc902 100644 ...@@ -307,7 +307,7 @@ index 17a87e9..e8cc902 100644
This version comes as part of the B<MariaDB> distribution. See B<http://mariadb.org/>. 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: following:
* Perl 5.005 or newer * Perl 5.005 or newer
...@@ -315,7 +315,7 @@ index 17a87e9..e8cc902 100644 ...@@ -315,7 +315,7 @@ index 17a87e9..e8cc902 100644
* Getopt::Long * Getopt::Long
* DBI and DBD::mysql * DBI and DBD::mysql
* Term::ReadKey from CPAN * 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 =over
...@@ -437,7 +437,7 @@ index 17a87e9..e8cc902 100644 ...@@ -437,7 +437,7 @@ index 17a87e9..e8cc902 100644
=head2 Shortcut Keys =head2 Shortcut Keys
The following keys perform various actions while B<mytop> is 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> =item B<I>
...@@ -459,7 +459,7 @@ index 17a87e9..e8cc902 100644 ...@@ -459,7 +459,7 @@ index 17a87e9..e8cc902 100644
=head1 BUGS =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 may appear odd. I have no good idea as to how best to deal with that
yet. Suggestions are welcome. yet. Suggestions are welcome.
......
debian/patches/remove-systemd-obsolete-target.patch
View file @ ccf02946
...@@ -11,9 +11,9 @@ diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in ...@@ -11,9 +11,9 @@ diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index 6a307b2..7f40583 100644 index 6a307b2..7f40583 100644
--- a/support-files/mariadb.service.in --- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in +++ b/support-files/mariadb.service.in
@@ -15,7 +15,6 @@ @@ -17,7 +17,6 @@ Description=MariaDB @VERSION@ database s
[Unit] Documentation=man:mysqld(8)
Description=MariaDB database server Documentation=https://mariadb.com/kb/en/library/systemd/
After=network.target After=network.target
-After=syslog.target -After=syslog.target
...@@ -23,9 +23,9 @@ diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service. ...@@ -23,9 +23,9 @@ diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.
index 410e743..02be006 100644 index 410e743..02be006 100644
--- a/support-files/mariadb@.service.in --- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in +++ b/support-files/mariadb@.service.in
@@ -20,7 +20,6 @@ @@ -22,7 +22,6 @@ Description=MariaDB @VERSION@ database s
[Unit] Documentation=man:mysqld(8)
Description=MariaDB database server Documentation=https://mariadb.com/kb/en/library/systemd/
After=network.target After=network.target
-After=syslog.target -After=syslog.target
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment