Skip to content

Commit 1c60f40

Browse files
abarkovabarkov
committed
Merge remote-tracking branch 'origin/10.2' into 10.3
2 parents f4484df + 50a8fc5 commit 1c60f40

File tree

19 files changed

+270
-24
lines changed

19 files changed

+270
-24
lines changed

‎extra/mariabackup/xtrabackup.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ MariaBackup: hot backup tool for InnoDB
44
Originally Created 3/3/2009 Yasufumi Kinoshita
55
Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
66
Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
7-
(c) 2017, 2018, MariaDB Corporation.
7+
(c) 2017, 2019, MariaDB Corporation.
88
Portions written by Marko Mäkelä.
99
1010
This program is free software; you can redistribute it and/or modify
@@ -5371,8 +5371,7 @@ static ibool prepare_handle_del_files(const char *datadir, const char *db, const
53715371

53725372
/** Implement --prepare
53735373
@return whether the operation succeeded */
5374-
static bool
5375-
xtrabackup_prepare_func(char** argv)
5374+
static bool xtrabackup_prepare_func(char** argv)
53765375
{
53775376
char metadata_path[FN_REFLEN];
53785377

‎mysql-test/main/func_math.result‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,49 @@ SELECT STDDEV_POP(ROUND(0,@A:=2009)) FROM (SELECT 1 UNION SELECT 2) fake_table;
826826
STDDEV_POP(ROUND(0,@A:=2009))
827827
0.0000
828828
#
829+
# Start of 10.1 tests
830+
#
831+
#
832+
# MDEV-17643 Assertion `nr >= 0.0' failed in Item_sum_std::val_real()
833+
#
834+
CREATE TABLE t1 ( pk int NOT NULL, i1 int NOT NULL, d1 date NOT NULL, t1 time);
835+
INSERT INTO t1 VALUES (7,9,'2007-08-15','03:55:02'),(8,7,'1993-06-05','04:17:51'),(9,7,'2034-07-01','17:31:12'),(10,0,'1998-08-24','08:09:27');
836+
SELECT DISTINCT STDDEV_SAMP(EXPORT_SET(t1, -1379790335835635712, (i1 + 'o'), (MD5(d1)))) FROM t1;
837+
STDDEV_SAMP(EXPORT_SET(t1, -1379790335835635712, (i1 + 'o'), (MD5(d1))))
838+
NULL
839+
Warnings:
840+
Warning 1292 Truncated incorrect DOUBLE value: 'o'
841+
Warning 1292 Truncated incorrect DOUBLE value: '98e466c7ff40fe6b95cde24200f376303-13797903358356357128e466c7ff40fe6b95cde24200f376303-13797903358356357128e466c7ff40fe6b95cde242'
842+
Warning 1292 Truncated incorrect DOUBLE value: 'o'
843+
Warning 1292 Truncated incorrect DOUBLE value: '-1379790335835635712e315457d879863c6ccf2ddee5562fc24-1379790335835635712e315457d879863c6ccf2ddee5562fc24-1379790335835635712e315'
844+
Warning 1292 Truncated incorrect DOUBLE value: 'o'
845+
Warning 1292 Truncated incorrect DOUBLE value: '7b4dd517b633f1f6304b773523b5279747b4dd517b633f1f6304b773523b5279747b4dd517b633f1f6304b773523b527974-1379790335835635712b4dd517b6'
846+
Warning 1292 Truncated incorrect DOUBLE value: 'o'
847+
Warning 1292 Truncated incorrect DOUBLE value: '-1379790335835635712b0e107767ea830fd3318893e40412a43-1379790335835635712b0e107767ea830fd3318893e40412a43-1379790335835635712b0e1'
848+
DROP TABLE t1;
849+
CREATE TABLE t1 (a VARCHAR(128));
850+
INSERT INTO t1 VALUES ('1e310');
851+
INSERT INTO t1 VALUES ('-1e310');
852+
INSERT INTO t1 VALUES ('0');
853+
SELECT STDDEV_SAMP(a) FROM t1;
854+
STDDEV_SAMP(a)
855+
NULL
856+
Warnings:
857+
Warning 1292 Truncated incorrect DOUBLE value: '1e310'
858+
Warning 1292 Truncated incorrect DOUBLE value: '-1e310'
859+
DROP TABLE t1;
860+
CREATE OR REPLACE TABLE t1 (a DOUBLE);
861+
INSERT INTO t1 VALUES (1.7e+308);
862+
INSERT INTO t1 VALUES (-1.7e+308);
863+
INSERT INTO t1 VALUES (0);
864+
SELECT STDDEV_SAMP(a) FROM t1;
865+
STDDEV_SAMP(a)
866+
NULL
867+
DROP TABLE t1;
868+
#
869+
# End of 10.1 tests
870+
#
871+
#
829872
# Start of 10.2 tests
830873
#
831874
# Test zero

‎mysql-test/main/func_math.test‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,37 @@ DROP TABLE t1;
596596
--echo #
597597
SELECT STDDEV_POP(ROUND(0,@A:=2009)) FROM (SELECT 1 UNION SELECT 2) fake_table;
598598

599+
--echo #
600+
--echo # Start of 10.1 tests
601+
--echo #
602+
603+
--echo #
604+
--echo # MDEV-17643 Assertion `nr >= 0.0' failed in Item_sum_std::val_real()
605+
--echo #
606+
607+
CREATE TABLE t1 ( pk int NOT NULL, i1 int NOT NULL, d1 date NOT NULL, t1 time);
608+
INSERT INTO t1 VALUES (7,9,'2007-08-15','03:55:02'),(8,7,'1993-06-05','04:17:51'),(9,7,'2034-07-01','17:31:12'),(10,0,'1998-08-24','08:09:27');
609+
SELECT DISTINCT STDDEV_SAMP(EXPORT_SET(t1, -1379790335835635712, (i1 + 'o'), (MD5(d1)))) FROM t1;
610+
DROP TABLE t1;
611+
612+
CREATE TABLE t1 (a VARCHAR(128));
613+
INSERT INTO t1 VALUES ('1e310');
614+
INSERT INTO t1 VALUES ('-1e310');
615+
INSERT INTO t1 VALUES ('0');
616+
SELECT STDDEV_SAMP(a) FROM t1;
617+
DROP TABLE t1;
618+
619+
CREATE OR REPLACE TABLE t1 (a DOUBLE);
620+
INSERT INTO t1 VALUES (1.7e+308);
621+
INSERT INTO t1 VALUES (-1.7e+308);
622+
INSERT INTO t1 VALUES (0);
623+
SELECT STDDEV_SAMP(a) FROM t1;
624+
DROP TABLE t1;
625+
626+
--echo #
627+
--echo # End of 10.1 tests
628+
--echo #
629+
599630
--echo #
600631
--echo # Start of 10.2 tests
601632
--echo #

‎mysql-test/main/func_str.result‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3165,6 +3165,77 @@ select md5(_filename "a"), sha(_filename "a");
31653165
md5(_filename "a") sha(_filename "a")
31663166
0cc175b9c0f1b6a831c399e269772661 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8
31673167
#
3168+
# MDEV-18881 Assertion `0' failed in make_sortkey upon SELECT with GROUP BY after LOAD DATA
3169+
#
3170+
CREATE TABLE t1 (a BIT(22), b CHAR(8) NOT NULL, c CHAR(8));
3171+
INSERT INTO t1 VALUES (0xA4B,'foo','qux');
3172+
INSERT INTO t1 VALUES (0x8F5,'bar','foobar');
3173+
INSERT INTO t1 VALUES (0x0, '', NULL);
3174+
INSERT INTO t1 VALUES (0x4B, 'foo','qux');
3175+
INSERT INTO t1 VALUES (0x8F5, 'bar', 'foobar');
3176+
SET SESSION SQL_MODE= '';
3177+
SELECT GROUP_CONCAT(c) AS f FROM t1 GROUP BY LPAD('foo', 20, b);
3178+
f
3179+
NULL
3180+
foobar,foobar
3181+
qux,qux
3182+
DROP TABLE t1;
3183+
SET SESSION SQL_MODE=DEFAULT;
3184+
CREATE TABLE t1 AS SELECT
3185+
LPAD('a',10,' '),
3186+
RPAD('a',10,' '),
3187+
LPAD('a',10,' '),
3188+
RPAD('a',10,' '),
3189+
LPAD('a',10,NULL),
3190+
RPAD('a',10,NULL),
3191+
LPAD('a',10,''),
3192+
RPAD('a',10,''),
3193+
LPAD('a',10,RAND()),
3194+
RPAD('a',10,RAND());
3195+
SHOW CREATE TABLE t1;
3196+
Table Create Table
3197+
t1 CREATE TABLE `t1` (
3198+
`LPAD('a',10,' ')` varchar(10) DEFAULT NULL,
3199+
`RPAD('a',10,' ')` varchar(10) DEFAULT NULL,
3200+
`LPAD('a',10,' ')` varchar(10) DEFAULT NULL,
3201+
`RPAD('a',10,' ')` varchar(10) DEFAULT NULL,
3202+
`LPAD('a',10,NULL)` varchar(10) DEFAULT NULL,
3203+
`RPAD('a',10,NULL)` varchar(10) DEFAULT NULL,
3204+
`LPAD('a',10,'')` varchar(10) DEFAULT NULL,
3205+
`RPAD('a',10,'')` varchar(10) DEFAULT NULL,
3206+
`LPAD('a',10,RAND())` varchar(10) DEFAULT NULL,
3207+
`RPAD('a',10,RAND())` varchar(10) DEFAULT NULL
3208+
) ENGINE=MyISAM DEFAULT CHARSET=latin1
3209+
DROP TABLE t1;
3210+
SET SESSION SQL_MODE= '';
3211+
CREATE TABLE t1 AS SELECT
3212+
LPAD('a',10,' '),
3213+
RPAD('a',10,' '),
3214+
LPAD('a',10,' '),
3215+
RPAD('a',10,' '),
3216+
LPAD('a',10,NULL),
3217+
RPAD('a',10,NULL),
3218+
LPAD('a',10,''),
3219+
RPAD('a',10,''),
3220+
LPAD('a',10,RAND()),
3221+
RPAD('a',10,RAND());
3222+
SHOW CREATE TABLE t1;
3223+
Table Create Table
3224+
t1 CREATE TABLE `t1` (
3225+
`LPAD('a',10,' ')` varchar(10) NOT NULL,
3226+
`RPAD('a',10,' ')` varchar(10) NOT NULL,
3227+
`LPAD('a',10,' ')` varchar(10) NOT NULL,
3228+
`RPAD('a',10,' ')` varchar(10) NOT NULL,
3229+
`LPAD('a',10,NULL)` varchar(10) DEFAULT NULL,
3230+
`RPAD('a',10,NULL)` varchar(10) DEFAULT NULL,
3231+
`LPAD('a',10,'')` varchar(10) DEFAULT NULL,
3232+
`RPAD('a',10,'')` varchar(10) DEFAULT NULL,
3233+
`LPAD('a',10,RAND())` varchar(10) DEFAULT NULL,
3234+
`RPAD('a',10,RAND())` varchar(10) DEFAULT NULL
3235+
) ENGINE=MyISAM DEFAULT CHARSET=latin1
3236+
DROP TABLE t1;
3237+
SET SESSION SQL_MODE=DEFAULT;
3238+
#
31683239
# End of 5.5 tests
31693240
#
31703241
#

‎mysql-test/main/func_str.test‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,6 +1663,51 @@ drop table t1,t2;
16631663
#
16641664
select md5(_filename "a"), sha(_filename "a");
16651665

1666+
--echo #
1667+
--echo # MDEV-18881 Assertion `0' failed in make_sortkey upon SELECT with GROUP BY after LOAD DATA
1668+
--echo #
1669+
1670+
CREATE TABLE t1 (a BIT(22), b CHAR(8) NOT NULL, c CHAR(8));
1671+
INSERT INTO t1 VALUES (0xA4B,'foo','qux');
1672+
INSERT INTO t1 VALUES (0x8F5,'bar','foobar');
1673+
INSERT INTO t1 VALUES (0x0, '', NULL);
1674+
INSERT INTO t1 VALUES (0x4B, 'foo','qux');
1675+
INSERT INTO t1 VALUES (0x8F5, 'bar', 'foobar');
1676+
SET SESSION SQL_MODE= '';
1677+
SELECT GROUP_CONCAT(c) AS f FROM t1 GROUP BY LPAD('foo', 20, b);
1678+
DROP TABLE t1;
1679+
SET SESSION SQL_MODE=DEFAULT;
1680+
1681+
CREATE TABLE t1 AS SELECT
1682+
LPAD('a',10,' '),
1683+
RPAD('a',10,' '),
1684+
LPAD('a',10,' '),
1685+
RPAD('a',10,' '),
1686+
LPAD('a',10,NULL),
1687+
RPAD('a',10,NULL),
1688+
LPAD('a',10,''),
1689+
RPAD('a',10,''),
1690+
LPAD('a',10,RAND()),
1691+
RPAD('a',10,RAND());
1692+
SHOW CREATE TABLE t1;
1693+
DROP TABLE t1;
1694+
SET SESSION SQL_MODE= '';
1695+
CREATE TABLE t1 AS SELECT
1696+
LPAD('a',10,' '),
1697+
RPAD('a',10,' '),
1698+
LPAD('a',10,' '),
1699+
RPAD('a',10,' '),
1700+
LPAD('a',10,NULL),
1701+
RPAD('a',10,NULL),
1702+
LPAD('a',10,''),
1703+
RPAD('a',10,''),
1704+
LPAD('a',10,RAND()),
1705+
RPAD('a',10,RAND());
1706+
SHOW CREATE TABLE t1;
1707+
DROP TABLE t1;
1708+
SET SESSION SQL_MODE=DEFAULT;
1709+
1710+
16661711
--echo #
16671712
--echo # End of 5.5 tests
16681713
--echo #

‎mysql-test/main/log_slow_debug.result‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ FROM mysql.slow_log
1414
WHERE sql_text NOT LIKE '%debug_dbug%';
1515
END
1616
$$
17+
CREATE PROCEDURE show_slow_log_exclude_ps()
18+
BEGIN
19+
SELECT CONCAT('[slow] ', sql_text) AS sql_text
20+
FROM mysql.slow_log
21+
WHERE sql_text NOT LIKE '%debug_dbug%'
22+
AND sql_text NOT IN ('Prepare','Close stmt');
23+
END
24+
$$
1725
#
1826
# Expect all admin statements in the slow log (ON,DEFAULT)
1927
#
@@ -33,7 +41,7 @@ PREPARE stmt FROM 'ALTER TABLE t4 MODIFY a INT DEFAULT 1';
3341
EXECUTE stmt;
3442
DEALLOCATE PREPARE stmt;
3543
DROP TABLE t4;
36-
CALL show_slow_log();
44+
CALL show_slow_log_exclude_ps();
3745
sql_text
3846
[slow] TRUNCATE TABLE mysql.slow_log
3947
[slow] CREATE TABLE t1 (a INT)
@@ -115,7 +123,7 @@ PREPARE stmt FROM 'ALTER TABLE t4 MODIFY a INT DEFAULT 1';
115123
EXECUTE stmt;
116124
DEALLOCATE PREPARE stmt;
117125
DROP TABLE t4;
118-
CALL show_slow_log();
126+
CALL show_slow_log_exclude_ps();
119127
sql_text
120128
[slow] TRUNCATE TABLE mysql.slow_log
121129
[slow] CREATE TABLE t1 (a INT)
@@ -140,3 +148,4 @@ SET @@global.slow_query_log= @org_slow_query_log;
140148
SET @@global.log_output= @org_log_output;
141149
SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements;
142150
DROP PROCEDURE show_slow_log;
151+
DROP PROCEDURE show_slow_log_exclude_ps;

‎mysql-test/main/log_slow_debug.test‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ BEGIN
1919
WHERE sql_text NOT LIKE '%debug_dbug%';
2020
END
2121
$$
22+
CREATE PROCEDURE show_slow_log_exclude_ps()
23+
BEGIN
24+
SELECT CONCAT('[slow] ', sql_text) AS sql_text
25+
FROM mysql.slow_log
26+
WHERE sql_text NOT LIKE '%debug_dbug%'
27+
AND sql_text NOT IN ('Prepare','Close stmt');
28+
END
29+
$$
2230
DELIMITER ;$$
2331

2432

@@ -42,7 +50,7 @@ PREPARE stmt FROM 'ALTER TABLE t4 MODIFY a INT DEFAULT 1';
4250
EXECUTE stmt;
4351
DEALLOCATE PREPARE stmt;
4452
DROP TABLE t4;
45-
CALL show_slow_log();
53+
CALL show_slow_log_exclude_ps();
4654

4755

4856
--echo #
@@ -111,7 +119,7 @@ PREPARE stmt FROM 'ALTER TABLE t4 MODIFY a INT DEFAULT 1';
111119
EXECUTE stmt;
112120
DEALLOCATE PREPARE stmt;
113121
DROP TABLE t4;
114-
CALL show_slow_log();
122+
CALL show_slow_log_exclude_ps();
115123

116124

117125
--echo #
@@ -124,3 +132,4 @@ SET @@global.slow_query_log= @org_slow_query_log;
124132
SET @@global.log_output= @org_log_output;
125133
SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements;
126134
DROP PROCEDURE show_slow_log;
135+
DROP PROCEDURE show_slow_log_exclude_ps;

‎mysql-test/main/subselect_sj.result‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3190,5 +3190,12 @@ EXECUTE stmt;
31903190
a
31913191
drop view v3;
31923192
drop table t1,t2,t3;
3193+
#
3194+
# MDEV-18896: IN subquery in WHERE of a table-less query used for INSERT
3195+
#
3196+
create table t1 (a1 varchar(25));
3197+
create table t2 (a2 varchar(25)) ;
3198+
insert into t1 select 'xxx' from dual where 'xxx' in (select a2 from t2);
3199+
drop table t1,t2;
31933200
# End of 5.5 test
31943201
set optimizer_switch=@subselect_sj_tmp;

‎mysql-test/main/subselect_sj.test‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,6 +2874,16 @@ EXECUTE stmt;
28742874
drop view v3;
28752875
drop table t1,t2,t3;
28762876

2877+
--echo #
2878+
--echo # MDEV-18896: IN subquery in WHERE of a table-less query used for INSERT
2879+
--echo #
2880+
2881+
create table t1 (a1 varchar(25));
2882+
create table t2 (a2 varchar(25)) ;
2883+
insert into t1 select 'xxx' from dual where 'xxx' in (select a2 from t2);
2884+
2885+
drop table t1,t2;
2886+
28772887
--echo # End of 5.5 test
28782888

28792889
# The following command must be the last one the file

‎mysql-test/main/subselect_sj_jcl6.result‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3204,6 +3204,13 @@ EXECUTE stmt;
32043204
a
32053205
drop view v3;
32063206
drop table t1,t2,t3;
3207+
#
3208+
# MDEV-18896: IN subquery in WHERE of a table-less query used for INSERT
3209+
#
3210+
create table t1 (a1 varchar(25));
3211+
create table t2 (a2 varchar(25)) ;
3212+
insert into t1 select 'xxx' from dual where 'xxx' in (select a2 from t2);
3213+
drop table t1,t2;
32073214
# End of 5.5 test
32083215
set optimizer_switch=@subselect_sj_tmp;
32093216
#

0 commit comments

Comments
 (0)