Skip to content

Commit c7c52ef

Browse files
author
Jan Lindström
authored
Merge branch '10.1' into MDEV-14144
2 parents f1de725 + de3725a commit c7c52ef

28 files changed

+347
-149
lines changed

‎configure.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,9 @@ CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H)
11111111
IF(NOT HAVE_UCONTEXT_H)
11121112
CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H)
11131113
ENDIF()
1114+
IF(HAVE_UCONTEXT_H)
1115+
CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H)
1116+
ENDIF()
11141117

11151118
CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_sec "time.h" STRUCT_TIMESPEC_HAS_TV_SEC)
11161119
CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_nsec "time.h" STRUCT_TIMESPEC_HAS_TV_NSEC)

‎debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ Build-Depends: bison,
2727
libjemalloc-dev (>= 3.0.0~) [linux-any]
2828
Standards-Version: 3.8.2
2929
Homepage: http://mariadb.org/
30-
Vcs-Git: https://github.com/MariaDB/server.git
3130
Vcs-Browser: https://github.com/MariaDB/server/
31+
Vcs-Git: https://github.com/MariaDB/server.git
3232

3333
Package: libmariadbclient18
3434
Architecture: any
@@ -450,4 +450,4 @@ Package: mariadb-backup-10.1
450450
Section: database
451451
Architecture: any
452452
Depends: libarchive12 | libarchive13
453-
Description: Backup tool for MariaDB server
453+
Description: Backup tool for MariaDB server

‎mysql-test/r/func_date_add.result

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,54 @@ select * from t1 where case a when adddate( '2012-12-12', 7 ) then true end;
102102
a
103103
drop table t1;
104104
End of 5.5 tests
105+
#
106+
# Start of 10.1 tests
107+
#
108+
#
109+
# MDEV-14452 Precision in INTERVAL xxx DAY_MICROSECOND parsed wrong?
110+
#
111+
SELECT
112+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5' DAY_MICROSECOND) c1,
113+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50' DAY_MICROSECOND) c2,
114+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500' DAY_MICROSECOND) c3,
115+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000' DAY_MICROSECOND) c4,
116+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000' DAY_MICROSECOND) c5,
117+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500000' DAY_MICROSECOND) c6,
118+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000000' DAY_MICROSECOND) c7,
119+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000000' DAY_MICROSECOND) c8,
120+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500000000' DAY_MICROSECOND) c9,
121+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000000000' DAY_MICROSECOND) c10,
122+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000000000' DAY_MICROSECOND) c11,
123+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500000000000' DAY_MICROSECOND) c12,
124+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000000000000' DAY_MICROSECOND) c13,
125+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000000000000' DAY_MICROSECOND) c14,
126+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500000000000000' DAY_MICROSECOND) c15,
127+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000000000000000' DAY_MICROSECOND) c16,
128+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000000000000000' DAY_MICROSECOND) c17,
129+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.500000000000000000' DAY_MICROSECOND) c18,
130+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.5000000000000000000' DAY_MICROSECOND) c19,
131+
DATE_ADD('1000-01-01 00:00:00', INTERVAL '0 00:00:01.50000000000000000000' DAY_MICROSECOND) c20
132+
;
133+
c1 1000-01-01 00:00:01.500000
134+
c2 1000-01-01 00:00:01.500000
135+
c3 1000-01-01 00:00:01.500000
136+
c4 1000-01-01 00:00:01.500000
137+
c5 1000-01-01 00:00:01.500000
138+
c6 1000-01-01 00:00:01.500000
139+
c7 1000-01-01 00:00:01.500000
140+
c8 1000-01-01 00:00:01.500000
141+
c9 1000-01-01 00:00:01.500000
142+
c10 1000-01-01 00:00:01.500000
143+
c11 1000-01-01 00:00:01.500000
144+
c12 1000-01-01 00:00:01.500000
145+
c13 1000-01-01 00:00:01.500000
146+
c14 1000-01-01 00:00:01.500000
147+
c15 1000-01-01 00:00:01.500000
148+
c16 1000-01-01 00:00:01.500000
149+
c17 1000-01-01 00:00:01.500000
150+
c18 1000-01-01 00:00:01.500000
151+
c19 1000-01-01 00:00:01.500000
152+
c20 NULL
153+
#
154+
# End of 10.1 tests
155+
#

‎mysql-test/r/func_time.result

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2904,6 +2904,30 @@ NULL
29042904
Warnings:
29052905
Warning 1441 Datetime function: datetime field overflow
29062906
#
2907+
# MDEV-13202 Assertion `ltime->neg == 0' failed in date_to_datetime
2908+
#
2909+
CREATE TABLE t1 (i INT, d DATE);
2910+
INSERT INTO t1 VALUES (1, '1970-01-01');
2911+
SELECT MAX(NULLIF(i,1)) FROM t1 ORDER BY DATE_SUB(d,INTERVAL 17300000 HOUR);
2912+
MAX(NULLIF(i,1))
2913+
NULL
2914+
Warnings:
2915+
Warning 1441 Datetime function: datetime field overflow
2916+
DROP TABLE t1;
2917+
CREATE TABLE t1 (i INT, d DATE);
2918+
INSERT INTO t1 VALUES (1, '1970-01-01');
2919+
SELECT CONCAT(DATE_SUB(d, INTERVAL 17300000 HOUR)) FROM t1;
2920+
CONCAT(DATE_SUB(d, INTERVAL 17300000 HOUR))
2921+
NULL
2922+
Warnings:
2923+
Warning 1441 Datetime function: datetime field overflow
2924+
DROP TABLE t1;
2925+
SELECT CONCAT(DATE_SUB(TIMESTAMP'1970-01-01 00:00:00', INTERVAL 17300000 HOUR));
2926+
CONCAT(DATE_SUB(TIMESTAMP'1970-01-01 00:00:00', INTERVAL 17300000 HOUR))
2927+
NULL
2928+
Warnings:
2929+
Warning 1441 Datetime function: datetime field overflow
2930+
#
29072931
# End of 10.0 tests
29082932
#
29092933
#

‎mysql-test/r/subselect_mat.result

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2757,6 +2757,21 @@ a b sq
27572757
4 2 1
27582758
drop table t1, t2;
27592759
#
2760+
# MDEV-15235: Assertion `length > 0' failed in create_ref_for_key
2761+
#
2762+
CREATE TABLE t1 (i INT);
2763+
INSERT INTO t1 VALUES (1),(2);
2764+
CREATE TABLE t2 (f CHAR(1));
2765+
INSERT INTO t2 VALUES ('a'),('b');
2766+
explain
2767+
SELECT * FROM t2 WHERE f IN ( SELECT LEFT('foo',0) FROM t1 ORDER BY 1 );
2768+
id select_type table type possible_keys key key_len ref rows Extra
2769+
1 PRIMARY t2 ALL NULL NULL NULL NULL 2 Using where
2770+
2 DEPENDENT SUBQUERY t1 ALL NULL NULL NULL NULL 2
2771+
SELECT * FROM t2 WHERE f IN ( SELECT LEFT('foo',0) FROM t1 ORDER BY 1 );
2772+
f
2773+
DROP TABLE t1, t2;
2774+
#
27602775
# MDEV-9489: Assertion `0' failed in Protocol::end_statement() on
27612776
# UNION ALL
27622777
#

‎mysql-test/suite/galera/disabled.def

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
# Do not use any TAB characters for whitespace.
1010
#
1111
##############################################################################
12-
MW-336 : MDEV-13549 Galera test failures
1312
galera_gra_log : MDEV-13549 Galera test failures
1413
galera_flush_local : MDEV-13549 Galera test failures
1514
galera_flush : MDEV-13549 Galera test failures
16-
MW-329 : MDEV-13549 Galera test failures
1715
galera_account_management : MariaDB 10.0 does not support ALTER USER
1816
galera_binlog_row_image : MariaDB 10.0 does not support binlog_row_image
1917
galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events
@@ -34,7 +32,6 @@ galera_ist_mysqldump : MDEV-13549 Galera test failures
3432
mysql-wsrep#31 : MDEV-13549 Galera test failures
3533
galera_migrate : MariaDB 10.0 does not support START SLAVE USER
3634
galera_concurrent_ctas : MDEV-13549 Galera test failures
37-
galera_bf_abort_for_update : MDEV-13549 Galera test failures
3835
galera_wsrep_desync_wsrep_on : MDEV-13549 Galera test failures
3936
galera_ssl_upgrade : MDEV-13549 Galera test failures
4037
mysql-wsrep#33 : MDEV-13549 Galera test failures
@@ -47,16 +44,10 @@ lp1376747 : MDEV-13549 Galera test failures
4744
galera_toi_ddl_nonconflicting : MDEV-13549 Galera test failures
4845
galera_parallel_simple : MDEV-13549 Galera test failures
4946
galera_admin : MDEV-13549 Galera test failures
50-
galera_var_max_ws_rows : MDEV-13549 Galera test failures 10.1
51-
MW-286 : MDEV-13549 Galera test failures 10.1
5247
galera_as_master: MDEV-13549 Galera test failures 10.1
5348
galera_pc_ignore_sb : MDEV-13549 Galera test failures 10.1
5449
galera_lock_table : MDEV-13549 Galera test failures 10.1
5550
MW-284 : MDEV-13549 Galera test failures 10.1
56-
MW-328C : MDEV-13549 Galera test failures 10.1
57-
MW-328A : MDEV-13549 Galera test failures 10.1
58-
MW-328B : MDEV-13549 Galera test failures 10.1
59-
MW-328 : MDEV-13549 Galera test failures 10.1
6051
galera_suspend_slave : MDEV-13549 Galera test failures 10.1
6152
galera_gtid : MDEV-13549 Galera test failures 10.1
6253
galera_gtid_slave : MDEV-13549 Galera test failures 10.1

‎mysql-test/suite/galera/r/MW-336.result

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@ SET GLOBAL wsrep_slave_threads = 10;
33
SET GLOBAL wsrep_slave_threads = 1;
44
INSERT INTO t1 VALUES (1);
55
SET GLOBAL wsrep_slave_threads = 10;
6-
SELECT COUNT(*) = 11 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
7-
COUNT(*) = 11
8-
1
96
SET GLOBAL wsrep_slave_threads = 20;
10-
SELECT COUNT(*) = 21 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
11-
COUNT(*) = 21
12-
1
137
SET GLOBAL wsrep_slave_threads = 1;
148
INSERT INTO t1 VALUES (1);
159
INSERT INTO t1 VALUES (2);
@@ -35,8 +29,5 @@ INSERT INTO t1 VALUES (17);
3529
INSERT INTO t1 VALUES (18);
3630
INSERT INTO t1 VALUES (19);
3731
INSERT INTO t1 VALUES (20);
38-
SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
39-
COUNT(*) = 2
40-
1
4132
SET GLOBAL wsrep_slave_threads = 1;
4233
DROP TABLE t1;

‎mysql-test/suite/galera/r/galera_bf_abort_for_update.result

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
1-
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
2-
SET AUTOCOMMIT=OFF;
3-
START TRANSACTION;
4-
INSERT INTO t1 VALUES (1);
5-
INSERT INTO t1 VALUES (1);
1+
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY, f2 INT) ENGINE=InnoDB;
2+
INSERT INTO t1 VALUES (1, 10);
3+
BEGIN;
64
SELECT * FROM t1 FOR UPDATE;
5+
f1 f2
6+
1 10
7+
UPDATE t1 SET f1 = 2;
8+
COMMIT;
79
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
8-
wsrep_local_aborts_increment
10+
wsrep_local_bf_aborts_diff
11+
1
12+
BEGIN;
13+
SELECT * FROM t1 FOR UPDATE;
14+
f1 f2
15+
2 10
16+
UPDATE t1 SET f2 = 20;
17+
COMMIT;
18+
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
19+
wsrep_local_bf_aborts_diff
920
1
1021
DROP TABLE t1;

‎mysql-test/suite/galera/t/MW-286.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ SET wsrep_on = FALSE;
2525
--error ER_QUERY_INTERRUPTED
2626
ALTER TABLE t1 ADD PRIMARY KEY (f1);
2727

28-
SET SESSION wsrep_sync_wait = 0;
2928
SET wsrep_on = TRUE;
3029
SET GLOBAL wsrep_desync = FALSE;
3130

‎mysql-test/suite/galera/t/MW-336.test

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ CREATE TABLE t1 (f1 INTEGER) Engine=InnoDB;
1010
--connection node_1
1111
SET GLOBAL wsrep_slave_threads = 10;
1212
SET GLOBAL wsrep_slave_threads = 1;
13+
--let $wait_condition = SELECT COUNT(*) = 11 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
14+
--source include/wait_condition.inc
1315

1416
--connection node_2
1517
INSERT INTO t1 VALUES (1);
1618

1719
--connection node_1
18-
--sleep 0.5
1920
SET GLOBAL wsrep_slave_threads = 10;
20-
--sleep 0.5
21-
SELECT COUNT(*) = 11 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
21+
--let $wait_condition = SELECT COUNT(*) = 11 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
22+
--source include/wait_condition.inc
2223

2324
SET GLOBAL wsrep_slave_threads = 20;
24-
--sleep 0.5
25-
SELECT COUNT(*) = 21 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
26-
25+
--let $wait_condition = SELECT COUNT(*) = 21 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
26+
--source include/wait_condition.inc
2727

2828
SET GLOBAL wsrep_slave_threads = 1;
2929

@@ -40,6 +40,9 @@ INSERT INTO t1 VALUES (9);
4040

4141

4242
--connection node_1
43+
--let $wait_condition = SELECT COUNT(*) = 12 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
44+
--source include/wait_condition.inc
45+
4346
SET GLOBAL wsrep_slave_threads = 10;
4447
SET GLOBAL wsrep_slave_threads = 0;
4548

@@ -57,8 +60,8 @@ INSERT INTO t1 VALUES (19);
5760
INSERT INTO t1 VALUES (20);
5861

5962
--connection node_1
60-
--sleep 0.5
61-
SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
63+
--let $wait_condition = SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user';
64+
--source include/wait_condition.inc
6265

6366
SET GLOBAL wsrep_slave_threads = 1;
6467
DROP TABLE t1;

0 commit comments

Comments
 (0)