database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Code Activity

MDEV-14900 Upstream 10.3 debian patches

Browse Source 
applied (at least partially):
* armhf_mroonga_storage_fail.patch (unaligned write)
* mysqld_multi.server_lsb-header.patch (add LSB header)
* fix-spelling-errors.patch (tabxml.cpp)
* hurd_socket.patch (in Platform.pm)
* remove-systemd-obsolete-target.patch
This commit is contained in:
Sergei Golubchik
2018-06-29 11:01:55 +02:00
parent 08b91548db
commit a39337415d
9 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/My/Platform.pm
View File

@@ -112,6 +112,8 @@ sub check_socket_path_length {
return 0 if ($^O eq 'aix'); return 0 if ($^O eq 'aix');
# See Debian bug #670722 - failing on kFreeBSD even after setting short path # See Debian bug #670722 - failing on kFreeBSD even after setting short path
return 0 if $^O eq 'gnukfreebsd' and length $path < 40; return 0 if $^O eq 'gnukfreebsd' and length $path < 40;
# GNU/Hurd doesn't have hostpath(), but no limitation either
return 0 if $^O eq 'gnu';
require IO::Socket::UNIX; require IO::Socket::UNIX;

2
mysql-test/suite/innodb_fts/t/innodb_fts_multiple_index.test
View File

@@ -25,7 +25,7 @@ ALTER TABLE t1 ADD FULLTEXT INDEX idx_1 (a);
ALTER TABLE t1 ADD FULLTEXT INDEX idx_2 (b); ALTER TABLE t1 ADD FULLTEXT INDEX idx_2 (b);
EVAL SHOW CREATE TABLE t1; EVAL SHOW CREATE TABLE t1;
# check mutiple index with transaction # check multiple index with transaction
START TRANSACTION; START TRANSACTION;
# Insert rows # Insert rows
INSERT INTO t1 (a,b) VALUES INSERT INTO t1 (a,b) VALUES

8
storage/connect/mysql-test/connect/r/xml2_mult.result
View File

@@ -51,14 +51,14 @@ WEB XQuery Kick Start en Per Bothner 2003 49.99
WEB XQuery Kick Start en Kurt Cagle 2003 49.99 WEB XQuery Kick Start en Kurt Cagle 2003 49.99
WEB Learning XML en Erik T. Ray 2003 39.95 WEB Learning XML en Erik T. Ray 2003 39.95
Warnings: Warnings:
Warning 1105 Mutiple values limited to 3 Warning 1105 Multiple values limited to 3
# One line lost because the where clause is applied only on the first 3 rows # One line lost because the where clause is applied only on the first 3 rows
SELECT category, title, author, price FROM bookstore WHERE author LIKE 'J%'; SELECT category, title, author, price FROM bookstore WHERE author LIKE 'J%';
category title author price category title author price
CHILDREN Harry Potter J K. Rowling 29.99 CHILDREN Harry Potter J K. Rowling 29.99
WEB XQuery Kick Start James McGovern 49.99 WEB XQuery Kick Start James McGovern 49.99
Warnings: Warnings:
Warning 1105 Mutiple values limited to 3 Warning 1105 Multiple values limited to 3
# #
# Testing concatenated values # Testing concatenated values
# #
@@ -91,12 +91,12 @@ CHILDREN Harry Potter en J K. Rowling 2005 29.99
WEB XQuery Kick Start en James McGovern, Per Bothner, Kurt Cagle, James Linn 2003 49.99 WEB XQuery Kick Start en James McGovern, Per Bothner, Kurt Cagle, James Linn 2003 49.99
WEB Learning XML en Erik T. Ray 2003 39.95 WEB Learning XML en Erik T. Ray 2003 39.95
Warnings: Warnings:
Warning 1105 Mutiple values limited to 4 Warning 1105 Multiple values limited to 4
# The where clause is applied on the concatenated column result # The where clause is applied on the concatenated column result
SELECT category, title, author, price FROM bookstore WHERE author LIKE 'J%'; SELECT category, title, author, price FROM bookstore WHERE author LIKE 'J%';
category title author price category title author price
CHILDREN Harry Potter J K. Rowling 29.99 CHILDREN Harry Potter J K. Rowling 29.99
WEB XQuery Kick Start James McGovern, Per Bothner, Kurt Cagle, James Linn 49.99 WEB XQuery Kick Start James McGovern, Per Bothner, Kurt Cagle, James Linn 49.99
Warnings: Warnings:
Warning 1105 Mutiple values limited to 4 Warning 1105 Multiple values limited to 4
DROP TABLE bookstore; DROP TABLE bookstore;

8
storage/connect/mysql-test/connect/r/xml_mult.result
View File

@@ -49,14 +49,14 @@ WEB XQuery Kick Start en Per Bothner 2003 49.99
WEB XQuery Kick Start en Kurt Cagle 2003 49.99 WEB XQuery Kick Start en Kurt Cagle 2003 49.99
WEB Learning XML en Erik T. Ray 2003 39.95 WEB Learning XML en Erik T. Ray 2003 39.95
Warnings: Warnings:
Warning 1105 Mutiple values limited to 3 Warning 1105 Multiple values limited to 3
# One line lost because the where clause is applied only on the first 3 rows # One line lost because the where clause is applied only on the first 3 rows
SELECT category, title, author, price FROM bookstore WHERE author LIKE 'J%'; SELECT category, title, author, price FROM bookstore WHERE author LIKE 'J%';
category title author price category title author price
CHILDREN Harry Potter J K. Rowling 29.99 CHILDREN Harry Potter J K. Rowling 29.99
WEB XQuery Kick Start James McGovern 49.99 WEB XQuery Kick Start James McGovern 49.99
Warnings: Warnings:
Warning 1105 Mutiple values limited to 3 Warning 1105 Multiple values limited to 3
# #
# Testing concatenated values # Testing concatenated values
# #
@@ -89,12 +89,12 @@ CHILDREN Harry Potter en J K. Rowling 2005 29.99
WEB XQuery Kick Start en James McGovern, Per Bothner, Kurt Cagle, James Linn 2003 49.99 WEB XQuery Kick Start en James McGovern, Per Bothner, Kurt Cagle, James Linn 2003 49.99
WEB Learning XML en Erik T. Ray 2003 39.95 WEB Learning XML en Erik T. Ray 2003 39.95
Warnings: Warnings:
Warning 1105 Mutiple values limited to 4 Warning 1105 Multiple values limited to 4
# The where clause is applied on the concatenated column result # The where clause is applied on the concatenated column result
SELECT category, title, author, price FROM bookstore WHERE author LIKE 'J%'; SELECT category, title, author, price FROM bookstore WHERE author LIKE 'J%';
category title author price category title author price
CHILDREN Harry Potter J K. Rowling 29.99 CHILDREN Harry Potter J K. Rowling 29.99
WEB XQuery Kick Start James McGovern, Per Bothner, Kurt Cagle, James Linn 49.99 WEB XQuery Kick Start James McGovern, Per Bothner, Kurt Cagle, James Linn 49.99
Warnings: Warnings:
Warning 1105 Mutiple values limited to 4 Warning 1105 Multiple values limited to 4
DROP TABLE bookstore; DROP TABLE bookstore;

2
storage/connect/tabxml.cpp
View File

@@ -1845,7 +1845,7 @@ void XMULCOL::ReadColumn(PGLOBAL g)
if (N > Tdbp->Limit) { if (N > Tdbp->Limit) {
N = Tdbp->Limit; N = Tdbp->Limit;
sprintf(g->Message, "Mutiple values limited to %d", Tdbp->Limit); sprintf(g->Message, "Multiple values limited to %d", Tdbp->Limit);
PushWarning(g, Tdbp); PushWarning(g, Tdbp);
} // endif N } // endif N

3
storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
View File

@@ -624,9 +624,10 @@ namespace mrn {
long long int long_long_value; long long int long_long_value;
mrn_byte_order_network_to_host(&long_long_value, grn_key, grn_key_size); mrn_byte_order_network_to_host(&long_long_value, grn_key, grn_key_size);
int max_bit = (grn_key_size * 8 - 1); int max_bit = (grn_key_size * 8 - 1);
*((long long int *)mysql_key) = long_long_value =
long_long_value ^ (((long_long_value ^ (1LL << max_bit)) >> max_bit) | long_long_value ^ (((long_long_value ^ (1LL << max_bit)) >> max_bit) |
(1LL << max_bit)); (1LL << max_bit));
memcpy(mysql_key, &long_long_value, sizeof(long_long_value));
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }

1
support-files/mariadb.service.in
View File

@@ -17,7 +17,6 @@ Description=MariaDB @VERSION@ database server
Documentation=man:mysqld(8) Documentation=man:mysqld(8)
Documentation=https://mariadb.com/kb/en/library/systemd/ Documentation=https://mariadb.com/kb/en/library/systemd/
After=network.target After=network.target
After=syslog.target
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

1
support-files/mariadb@.service.in
View File

@@ -22,7 +22,6 @@ Description=MariaDB @VERSION@ database server (multi-instance)
Documentation=man:mysqld(8) Documentation=man:mysqld(8)
Documentation=https://mariadb.com/kb/en/library/systemd/ Documentation=https://mariadb.com/kb/en/library/systemd/
After=network.target After=network.target
After=syslog.target
ConditionPathExists=@sysconf2dir@/my%I.cnf ConditionPathExists=@sysconf2dir@/my%I.cnf

19
support-files/mysqld_multi.server.sh
View File

@@ -14,8 +14,23 @@
# Version 1.0 # Version 1.0
# #
basedir=/usr/local/mysql ### BEGIN INIT INFO
bindir=/usr/local/mysql/bin # Provides: mysqld_multi
# Required-Start: $local_fs $network $remote_fs
# Should-Start: ypbind nscd ldap ntpd xntpd
# Required-Stop: $local_fs $network $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Start and stop multiple mysql database server daemon instances
# Description: Controls multiple MariaDB database server daemon instances
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
NAME=mysqld_multi
DESC=mysqld_multi
basedir=/usr
bindir=/usr/bin
if test -x $bindir/mysqld_multi if test -x $bindir/mysqld_multi
then then