From 90b9c957ba6380a717aaef6285b3f1498f4a29dc Mon Sep 17 00:00:00 2001
From: Karthik Kamath <karthik.kamath@oracle.com>
Date: Wed, 18 May 2016 11:07:29 +0530
Subject: BUG#21142859: FUNCTION UPDATING A VIEW FAILS TO FIND TABLE           
    THAT ACTUALLY EXISTS

ANALYSIS:
=========
Stored functions updating a view where the view table has a
trigger defined that updates another table, fails reporting
an error that the table doesn't exist.

If there is a trigger defined on a table, a variable
'trg_event_map' will be set to a non-zero value after the
parsed tree creation. This indicates what triggers we need to
pre-load for the TABLE_LIST when opening an associated table.

During the prelocking phase, the variable 'trg_event_map'
will not be set for the view table. This value will be set
after the processing of triggers defined on the table. During
the processing of sub-statements, 'locked_tables_mode' will be
set to 'LTM_PRELOCKED' which denotes that further locking
of tables/functions cannot be done. This results in the other
table not being locked and thus further processing results in
an error getting reported.

FIX:
====
During the prelocking of view, the value of 'trg_event_map'
of the view is copied to 'trg_event_map' of the next table
in the TABLE_LIST. This results in the locking of tables
associated with the trigger as well.
---
 mysql-test/r/sp-prelocking.result | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/sp-prelocking.result b/mysql-test/r/sp-prelocking.result
index 186b2c05d34..ac48459b0f2 100644
--- a/mysql-test/r/sp-prelocking.result
+++ b/mysql-test/r/sp-prelocking.result
@@ -320,3 +320,23 @@ c2
 DROP TRIGGER t1_ai;
 DROP TABLE t1, t2;
 End of 5.0 tests
+#
+# Bug#21142859: FUNCTION UPDATING A VIEW FAILS TO FIND TABLE THAT ACTUALLY EXISTS
+#
+CREATE TABLE t1 SELECT 1 AS fld1, 'A' AS fld2;
+CREATE TABLE t2 (fld3 INT, fld4 CHAR(1));
+CREATE VIEW v1 AS SELECT * FROM t1;
+CREATE TRIGGER t1_au AFTER UPDATE ON t1
+FOR EACH ROW INSERT INTO t2 VALUES (new.fld1, new.fld2);
+CREATE FUNCTION f1() RETURNS INT
+BEGIN
+UPDATE v1 SET fld2='B' WHERE fld1=1;
+RETURN row_count();
+END !
+# Without the patch, an error was getting reported.
+SELECT f1();
+f1()
+1
+DROP FUNCTION f1;
+DROP VIEW v1;
+DROP TABLE t1,t2;
-- 
cgit v1.2.1


From 115f08284df1dac6a29cbca49dc7534b4a4f23f7 Mon Sep 17 00:00:00 2001
From: Sreeharsha Ramanavarapu <sreeharsha.ramanavarapu@oracle.com>
Date: Tue, 24 May 2016 07:44:21 +0530
Subject: Bug #23279858: MYSQLD GOT SIGNAL 11 ON SIMPLE SELECT               
 NAME_CONST QUERY

ISSUE:
------
Using NAME_CONST with a non-constant negated expression as
value can result in incorrect behavior.

SOLUTION:
---------
The problem can be avoided by checking whether the argument
is a constant value.

The fix is a backport of Bug#12735545.
---
 mysql-test/r/func_misc.result | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index c9552d9e39f..de46f070065 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -403,3 +403,10 @@ DROP TABLE t1;
 #
 # End of tests
 #
+SELECT NAME_CONST('a', -(1 OR 2)) OR 1;
+ERROR HY000: Incorrect arguments to NAME_CONST
+SELECT NAME_CONST('a', -(1 AND 2)) OR 1;
+ERROR HY000: Incorrect arguments to NAME_CONST
+SELECT NAME_CONST('a', -(1)) OR 1;
+NAME_CONST('a', -(1)) OR 1
+1
-- 
cgit v1.2.1


From 9f7288e2e0179db478d20c74f57b5c7d6c95f793 Mon Sep 17 00:00:00 2001
From: Thayumanavar S <thayumanavar.x.sachithanantha@oracle.com>
Date: Mon, 20 Jun 2016 11:35:43 +0530
Subject: BUG#23080148 - BACKPORT BUG 14653594 AND BUG 20683959 TO             
   MYSQL-5.5

The bug asks for a backport of bug#1463594 and bug#20682959. This
is required because of the fact that if replication is enabled, master
transaction can commit whereas slave can't commit due to not exact
'enviroment'. This manifestation is seen in bug#22024200.
---
 mysql-test/r/loaddata.result | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index 2d67d24bedd..2f2a3579eec 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -507,7 +507,7 @@ DROP TABLE t1;
 # Bug#11765139  58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS AND WRITES WITH U
 #
 CREATE TABLE t1(f1 INT);
-SELECT 0xE1BB30 INTO OUTFILE 't1.dat';
+SELECT 0xE1C330 INTO OUTFILE 't1.dat';
 LOAD DATA INFILE 't1.dat' IGNORE INTO TABLE t1 CHARACTER SET utf8;
 DROP TABLE t1;
 #
@@ -532,3 +532,27 @@ FIELDS TERMINATED BY 't' LINES TERMINATED BY '';
 Got one of the listed errors
 SET @@sql_mode= @old_mode;
 DROP TABLE t1;
+
+#
+#  Bug#23080148 - Backport of Bug#20683959.
+#  Bug#20683959 LOAD DATA INFILE IGNORES A SPECIFIC ROW SILENTLY
+#               UNDER DB CHARSET IS UTF8.
+#
+CREATE DATABASE d1 CHARSET latin1;
+USE d1;
+CREATE TABLE t1 (val TEXT);
+LOAD DATA INFILE '../../std_data/bug20683959loaddata.txt' INTO TABLE t1;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+1
+SELECT HEX(val) FROM t1;
+HEX(val)
+C38322525420406E696F757A656368756E3A20E98198E2889AF58081AEE7B99DE4B88AE383A3E7B99DE69690F58087B3E7B9A7EFBDA8E7B99DEFBDB3E7B99DE78999E880B3E7B8BAEFBDAAE7B9A7E89699E296A1E7B8BAE4BBA3EFBD8CE7B8BAEFBDA9E7B8B2E2889AE38184E7B99DEFBDB3E7B99DE4B88AE383A3E7B99DE69690F58087B3E7B9A7EFBDA8E7B99DEFBDB3E7B99DE5B3A8EFBD84E8ABA0EFBDA8E89C89F580948EE599AAE7B8BAEFBDAAE7B8BAE9A198EFBDA9EFBDB1E7B9A7E581B5E289A0E7B8BAEFBDBEE7B9A7E9A194EFBDA9E882B4EFBDA5EFBDB5E980A7F5808B96E28693E99EABE38287E58F99E7B8BAE58AB1E28691E7B8BAF5808B9AE7828AE98095EFBDB1E7B8BAEFBDAFE7B8B2E288ABE6A89FE89EB3E6BA98F58081ADE88EA0EFBDBAE98095E6BA98F58081AEE89D93EFBDBAE8AD9BEFBDACE980A7F5808B96E28693E7B8BAF580918EE288AAE7B8BAE4B88AEFBC9EE7B8BAE4B99DE28691E7B8BAF5808B96EFBCA0E88DB3E6A68AEFBDB9EFBDB3E981B2E5B3A8E296A1E7B8BAE7A4BCE7828AE88DB3E6A68AEFBDB0EFBDBDE7B8BAA0E7B8BAE88B93EFBDBEE5B899EFBC9E
+CREATE DATABASE d2 CHARSET utf8;
+USE d2;
+CREATE TABLE t1 (val TEXT);
+LOAD DATA INFILE '../../std_data/bug20683959loaddata.txt' INTO TABLE t1;
+ERROR HY000: Invalid utf8 character string: 'Ã"RT @niouzechun: \9058\221A'
+DROP TABLE d1.t1, d2.t1;
+DROP DATABASE d1;
+DROP DATABASE d2;
-- 
cgit v1.2.1


From 1ec91803aca76c999d34d9f17938b976093cb67a Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.org>
Date: Sun, 3 Jul 2016 13:52:06 +0400
Subject: MDEV-10317 EXCTACT(MINUTE_MICROSECOND) truncates data

---
 mysql-test/r/func_time.result | 329 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 329 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index ad51010de30..a6c63e6593a 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -2806,3 +2806,332 @@ Warning	1292	Truncated incorrect time value: '-1441:00:00'
 #
 # End of 10.0 tests
 #
+#
+# Start of 10.1 tests
+#
+#
+# MDEV-10317 EXCTACT(MINUTE_MICROSECOND) truncates data
+#
+CREATE TABLE t1 (a DATETIME(6));
+INSERT INTO t1 VALUES ('1999-12-31 23:59:59.999999');
+SELECT
+a,
+EXTRACT(YEAR FROM a),
+EXTRACT(YEAR_MONTH FROM a),
+EXTRACT(QUARTER FROM a),
+EXTRACT(MONTH FROM a),
+EXTRACT(WEEK FROM a),
+EXTRACT(DAY FROM a),
+EXTRACT(DAY_HOUR FROM a),
+EXTRACT(DAY_MINUTE FROM a),
+EXTRACT(DAY_SECOND FROM a),
+EXTRACT(HOUR FROM a),
+EXTRACT(HOUR_MINUTE FROM a),
+EXTRACT(HOUR_SECOND FROM a),
+EXTRACT(MINUTE FROM a),
+EXTRACT(MINUTE_SECOND FROM a),
+EXTRACT(SECOND FROM a),
+EXTRACT(MICROSECOND FROM a),
+EXTRACT(DAY_MICROSECOND FROM a),
+EXTRACT(HOUR_MICROSECOND FROM a),
+EXTRACT(MINUTE_MICROSECOND FROM a),
+EXTRACT(SECOND_MICROSECOND FROM a)
+FROM t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def	test	t1	t1	a	a	12	26	26	Y	128	6	63
+def					EXTRACT(YEAR FROM a)	3	4	4	Y	32896	0	63
+def					EXTRACT(YEAR_MONTH FROM a)	3	6	6	Y	32896	0	63
+def					EXTRACT(QUARTER FROM a)	3	2	1	Y	32896	0	63
+def					EXTRACT(MONTH FROM a)	3	2	2	Y	32896	0	63
+def					EXTRACT(WEEK FROM a)	3	2	2	Y	32896	0	63
+def					EXTRACT(DAY FROM a)	3	2	2	Y	32896	0	63
+def					EXTRACT(DAY_HOUR FROM a)	3	5	4	Y	32896	0	63
+def					EXTRACT(DAY_MINUTE FROM a)	3	7	6	Y	32896	0	63
+def					EXTRACT(DAY_SECOND FROM a)	3	9	8	Y	32896	0	63
+def					EXTRACT(HOUR FROM a)	3	3	2	Y	32896	0	63
+def					EXTRACT(HOUR_MINUTE FROM a)	3	5	4	Y	32896	0	63
+def					EXTRACT(HOUR_SECOND FROM a)	3	7	6	Y	32896	0	63
+def					EXTRACT(MINUTE FROM a)	3	3	2	Y	32896	0	63
+def					EXTRACT(MINUTE_SECOND FROM a)	3	5	4	Y	32896	0	63
+def					EXTRACT(SECOND FROM a)	3	3	2	Y	32896	0	63
+def					EXTRACT(MICROSECOND FROM a)	3	7	6	Y	32896	0	63
+def					EXTRACT(DAY_MICROSECOND FROM a)	8	15	14	Y	32896	0	63
+def					EXTRACT(HOUR_MICROSECOND FROM a)	8	13	12	Y	32896	0	63
+def					EXTRACT(MINUTE_MICROSECOND FROM a)	8	11	10	Y	32896	0	63
+def					EXTRACT(SECOND_MICROSECOND FROM a)	3	9	8	Y	32896	0	63
+a	1999-12-31 23:59:59.999999
+EXTRACT(YEAR FROM a)	1999
+EXTRACT(YEAR_MONTH FROM a)	199912
+EXTRACT(QUARTER FROM a)	4
+EXTRACT(MONTH FROM a)	12
+EXTRACT(WEEK FROM a)	52
+EXTRACT(DAY FROM a)	31
+EXTRACT(DAY_HOUR FROM a)	3123
+EXTRACT(DAY_MINUTE FROM a)	312359
+EXTRACT(DAY_SECOND FROM a)	31235959
+EXTRACT(HOUR FROM a)	23
+EXTRACT(HOUR_MINUTE FROM a)	2359
+EXTRACT(HOUR_SECOND FROM a)	235959
+EXTRACT(MINUTE FROM a)	59
+EXTRACT(MINUTE_SECOND FROM a)	5959
+EXTRACT(SECOND FROM a)	59
+EXTRACT(MICROSECOND FROM a)	999999
+EXTRACT(DAY_MICROSECOND FROM a)	31235959999999
+EXTRACT(HOUR_MICROSECOND FROM a)	235959999999
+EXTRACT(MINUTE_MICROSECOND FROM a)	5959999999
+EXTRACT(SECOND_MICROSECOND FROM a)	59999999
+CREATE TABLE t2 AS SELECT
+a,
+EXTRACT(YEAR FROM a),
+EXTRACT(YEAR_MONTH FROM a),
+EXTRACT(QUARTER FROM a),
+EXTRACT(MONTH FROM a),
+EXTRACT(WEEK FROM a),
+EXTRACT(DAY FROM a),
+EXTRACT(DAY_HOUR FROM a),
+EXTRACT(DAY_MINUTE FROM a),
+EXTRACT(DAY_SECOND FROM a),
+EXTRACT(HOUR FROM a),
+EXTRACT(HOUR_MINUTE FROM a),
+EXTRACT(HOUR_SECOND FROM a),
+EXTRACT(MINUTE FROM a),
+EXTRACT(MINUTE_SECOND FROM a),
+EXTRACT(SECOND FROM a),
+EXTRACT(MICROSECOND FROM a),
+EXTRACT(DAY_MICROSECOND FROM a),
+EXTRACT(HOUR_MICROSECOND FROM a),
+EXTRACT(MINUTE_MICROSECOND FROM a),
+EXTRACT(SECOND_MICROSECOND FROM a)
+FROM t1;
+SELECT * FROM t2;
+a	1999-12-31 23:59:59.999999
+EXTRACT(YEAR FROM a)	1999
+EXTRACT(YEAR_MONTH FROM a)	199912
+EXTRACT(QUARTER FROM a)	4
+EXTRACT(MONTH FROM a)	12
+EXTRACT(WEEK FROM a)	52
+EXTRACT(DAY FROM a)	31
+EXTRACT(DAY_HOUR FROM a)	3123
+EXTRACT(DAY_MINUTE FROM a)	312359
+EXTRACT(DAY_SECOND FROM a)	31235959
+EXTRACT(HOUR FROM a)	23
+EXTRACT(HOUR_MINUTE FROM a)	2359
+EXTRACT(HOUR_SECOND FROM a)	235959
+EXTRACT(MINUTE FROM a)	59
+EXTRACT(MINUTE_SECOND FROM a)	5959
+EXTRACT(SECOND FROM a)	59
+EXTRACT(MICROSECOND FROM a)	999999
+EXTRACT(DAY_MICROSECOND FROM a)	31235959999999
+EXTRACT(HOUR_MICROSECOND FROM a)	235959999999
+EXTRACT(MINUTE_MICROSECOND FROM a)	5959999999
+EXTRACT(SECOND_MICROSECOND FROM a)	59999999
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` datetime(6) DEFAULT NULL,
+  `EXTRACT(YEAR FROM a)` int(4) DEFAULT NULL,
+  `EXTRACT(YEAR_MONTH FROM a)` int(6) DEFAULT NULL,
+  `EXTRACT(QUARTER FROM a)` int(2) DEFAULT NULL,
+  `EXTRACT(MONTH FROM a)` int(2) DEFAULT NULL,
+  `EXTRACT(WEEK FROM a)` int(2) DEFAULT NULL,
+  `EXTRACT(DAY FROM a)` int(2) DEFAULT NULL,
+  `EXTRACT(DAY_HOUR FROM a)` int(5) DEFAULT NULL,
+  `EXTRACT(DAY_MINUTE FROM a)` int(7) DEFAULT NULL,
+  `EXTRACT(DAY_SECOND FROM a)` int(9) DEFAULT NULL,
+  `EXTRACT(HOUR FROM a)` int(3) DEFAULT NULL,
+  `EXTRACT(HOUR_MINUTE FROM a)` int(5) DEFAULT NULL,
+  `EXTRACT(HOUR_SECOND FROM a)` int(7) DEFAULT NULL,
+  `EXTRACT(MINUTE FROM a)` int(3) DEFAULT NULL,
+  `EXTRACT(MINUTE_SECOND FROM a)` int(5) DEFAULT NULL,
+  `EXTRACT(SECOND FROM a)` int(3) DEFAULT NULL,
+  `EXTRACT(MICROSECOND FROM a)` int(7) DEFAULT NULL,
+  `EXTRACT(DAY_MICROSECOND FROM a)` bigint(15) DEFAULT NULL,
+  `EXTRACT(HOUR_MICROSECOND FROM a)` bigint(13) DEFAULT NULL,
+  `EXTRACT(MINUTE_MICROSECOND FROM a)` bigint(11) DEFAULT NULL,
+  `EXTRACT(SECOND_MICROSECOND FROM a)` int(9) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1,t2;
+CREATE TABLE t1 (a TIME(6));
+INSERT INTO t1 VALUES ('-838:59:59.999999'),('838:59:59.999999');
+SELECT
+a,
+EXTRACT(YEAR FROM a),
+EXTRACT(YEAR_MONTH FROM a),
+EXTRACT(QUARTER FROM a),
+EXTRACT(MONTH FROM a),
+EXTRACT(WEEK FROM a),
+EXTRACT(DAY FROM a),
+EXTRACT(DAY_HOUR FROM a),
+EXTRACT(DAY_MINUTE FROM a),
+EXTRACT(DAY_SECOND FROM a),
+EXTRACT(HOUR FROM a),
+EXTRACT(HOUR_MINUTE FROM a),
+EXTRACT(HOUR_SECOND FROM a),
+EXTRACT(MINUTE FROM a),
+EXTRACT(MINUTE_SECOND FROM a),
+EXTRACT(SECOND FROM a),
+EXTRACT(MICROSECOND FROM a),
+EXTRACT(DAY_MICROSECOND FROM a),
+EXTRACT(HOUR_MICROSECOND FROM a),
+EXTRACT(MINUTE_MICROSECOND FROM a),
+EXTRACT(SECOND_MICROSECOND FROM a)
+FROM t1;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def	test	t1	t1	a	a	11	17	17	Y	128	6	63
+def					EXTRACT(YEAR FROM a)	3	4	1	Y	32896	0	63
+def					EXTRACT(YEAR_MONTH FROM a)	3	6	1	Y	32896	0	63
+def					EXTRACT(QUARTER FROM a)	3	2	1	Y	32896	0	63
+def					EXTRACT(MONTH FROM a)	3	2	1	Y	32896	0	63
+def					EXTRACT(WEEK FROM a)	3	2	9	Y	32896	0	63
+def					EXTRACT(DAY FROM a)	3	2	2	Y	32896	0	63
+def					EXTRACT(DAY_HOUR FROM a)	3	5	5	Y	32896	0	63
+def					EXTRACT(DAY_MINUTE FROM a)	3	7	7	Y	32896	0	63
+def					EXTRACT(DAY_SECOND FROM a)	3	9	9	Y	32896	0	63
+def					EXTRACT(HOUR FROM a)	3	3	3	Y	32896	0	63
+def					EXTRACT(HOUR_MINUTE FROM a)	3	5	5	Y	32896	0	63
+def					EXTRACT(HOUR_SECOND FROM a)	3	7	7	Y	32896	0	63
+def					EXTRACT(MINUTE FROM a)	3	3	3	Y	32896	0	63
+def					EXTRACT(MINUTE_SECOND FROM a)	3	5	5	Y	32896	0	63
+def					EXTRACT(SECOND FROM a)	3	3	3	Y	32896	0	63
+def					EXTRACT(MICROSECOND FROM a)	3	7	7	Y	32896	0	63
+def					EXTRACT(DAY_MICROSECOND FROM a)	8	15	15	Y	32896	0	63
+def					EXTRACT(HOUR_MICROSECOND FROM a)	8	13	13	Y	32896	0	63
+def					EXTRACT(MINUTE_MICROSECOND FROM a)	8	11	11	Y	32896	0	63
+def					EXTRACT(SECOND_MICROSECOND FROM a)	3	9	9	Y	32896	0	63
+a	-838:59:59.999999
+EXTRACT(YEAR FROM a)	0
+EXTRACT(YEAR_MONTH FROM a)	0
+EXTRACT(QUARTER FROM a)	0
+EXTRACT(MONTH FROM a)	0
+EXTRACT(WEEK FROM a)	613566757
+EXTRACT(DAY FROM a)	34
+EXTRACT(DAY_HOUR FROM a)	-3422
+EXTRACT(DAY_MINUTE FROM a)	-342259
+EXTRACT(DAY_SECOND FROM a)	-34225959
+EXTRACT(HOUR FROM a)	-22
+EXTRACT(HOUR_MINUTE FROM a)	-2259
+EXTRACT(HOUR_SECOND FROM a)	-225959
+EXTRACT(MINUTE FROM a)	-59
+EXTRACT(MINUTE_SECOND FROM a)	-5959
+EXTRACT(SECOND FROM a)	-59
+EXTRACT(MICROSECOND FROM a)	-999999
+EXTRACT(DAY_MICROSECOND FROM a)	-34225959999999
+EXTRACT(HOUR_MICROSECOND FROM a)	-225959999999
+EXTRACT(MINUTE_MICROSECOND FROM a)	-5959999999
+EXTRACT(SECOND_MICROSECOND FROM a)	-59999999
+a	838:59:59.999999
+EXTRACT(YEAR FROM a)	0
+EXTRACT(YEAR_MONTH FROM a)	0
+EXTRACT(QUARTER FROM a)	0
+EXTRACT(MONTH FROM a)	0
+EXTRACT(WEEK FROM a)	613566757
+EXTRACT(DAY FROM a)	34
+EXTRACT(DAY_HOUR FROM a)	3422
+EXTRACT(DAY_MINUTE FROM a)	342259
+EXTRACT(DAY_SECOND FROM a)	34225959
+EXTRACT(HOUR FROM a)	22
+EXTRACT(HOUR_MINUTE FROM a)	2259
+EXTRACT(HOUR_SECOND FROM a)	225959
+EXTRACT(MINUTE FROM a)	59
+EXTRACT(MINUTE_SECOND FROM a)	5959
+EXTRACT(SECOND FROM a)	59
+EXTRACT(MICROSECOND FROM a)	999999
+EXTRACT(DAY_MICROSECOND FROM a)	34225959999999
+EXTRACT(HOUR_MICROSECOND FROM a)	225959999999
+EXTRACT(MINUTE_MICROSECOND FROM a)	5959999999
+EXTRACT(SECOND_MICROSECOND FROM a)	59999999
+CREATE TABLE t2 AS SELECT
+a,
+EXTRACT(YEAR FROM a),
+EXTRACT(YEAR_MONTH FROM a),
+EXTRACT(QUARTER FROM a),
+EXTRACT(MONTH FROM a),
+EXTRACT(WEEK FROM a),
+EXTRACT(DAY FROM a),
+EXTRACT(DAY_HOUR FROM a),
+EXTRACT(DAY_MINUTE FROM a),
+EXTRACT(DAY_SECOND FROM a),
+EXTRACT(HOUR FROM a),
+EXTRACT(HOUR_MINUTE FROM a),
+EXTRACT(HOUR_SECOND FROM a),
+EXTRACT(MINUTE FROM a),
+EXTRACT(MINUTE_SECOND FROM a),
+EXTRACT(SECOND FROM a),
+EXTRACT(MICROSECOND FROM a),
+EXTRACT(DAY_MICROSECOND FROM a),
+EXTRACT(HOUR_MICROSECOND FROM a),
+EXTRACT(MINUTE_MICROSECOND FROM a),
+EXTRACT(SECOND_MICROSECOND FROM a)
+FROM t1;
+SELECT * FROM t2;
+a	-838:59:59.999999
+EXTRACT(YEAR FROM a)	0
+EXTRACT(YEAR_MONTH FROM a)	0
+EXTRACT(QUARTER FROM a)	0
+EXTRACT(MONTH FROM a)	0
+EXTRACT(WEEK FROM a)	613566757
+EXTRACT(DAY FROM a)	34
+EXTRACT(DAY_HOUR FROM a)	-3422
+EXTRACT(DAY_MINUTE FROM a)	-342259
+EXTRACT(DAY_SECOND FROM a)	-34225959
+EXTRACT(HOUR FROM a)	-22
+EXTRACT(HOUR_MINUTE FROM a)	-2259
+EXTRACT(HOUR_SECOND FROM a)	-225959
+EXTRACT(MINUTE FROM a)	-59
+EXTRACT(MINUTE_SECOND FROM a)	-5959
+EXTRACT(SECOND FROM a)	-59
+EXTRACT(MICROSECOND FROM a)	-999999
+EXTRACT(DAY_MICROSECOND FROM a)	-34225959999999
+EXTRACT(HOUR_MICROSECOND FROM a)	-225959999999
+EXTRACT(MINUTE_MICROSECOND FROM a)	-5959999999
+EXTRACT(SECOND_MICROSECOND FROM a)	-59999999
+a	838:59:59.999999
+EXTRACT(YEAR FROM a)	0
+EXTRACT(YEAR_MONTH FROM a)	0
+EXTRACT(QUARTER FROM a)	0
+EXTRACT(MONTH FROM a)	0
+EXTRACT(WEEK FROM a)	613566757
+EXTRACT(DAY FROM a)	34
+EXTRACT(DAY_HOUR FROM a)	3422
+EXTRACT(DAY_MINUTE FROM a)	342259
+EXTRACT(DAY_SECOND FROM a)	34225959
+EXTRACT(HOUR FROM a)	22
+EXTRACT(HOUR_MINUTE FROM a)	2259
+EXTRACT(HOUR_SECOND FROM a)	225959
+EXTRACT(MINUTE FROM a)	59
+EXTRACT(MINUTE_SECOND FROM a)	5959
+EXTRACT(SECOND FROM a)	59
+EXTRACT(MICROSECOND FROM a)	999999
+EXTRACT(DAY_MICROSECOND FROM a)	34225959999999
+EXTRACT(HOUR_MICROSECOND FROM a)	225959999999
+EXTRACT(MINUTE_MICROSECOND FROM a)	5959999999
+EXTRACT(SECOND_MICROSECOND FROM a)	59999999
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` time(6) DEFAULT NULL,
+  `EXTRACT(YEAR FROM a)` int(4) DEFAULT NULL,
+  `EXTRACT(YEAR_MONTH FROM a)` int(6) DEFAULT NULL,
+  `EXTRACT(QUARTER FROM a)` int(2) DEFAULT NULL,
+  `EXTRACT(MONTH FROM a)` int(2) DEFAULT NULL,
+  `EXTRACT(WEEK FROM a)` int(2) DEFAULT NULL,
+  `EXTRACT(DAY FROM a)` int(2) DEFAULT NULL,
+  `EXTRACT(DAY_HOUR FROM a)` int(5) DEFAULT NULL,
+  `EXTRACT(DAY_MINUTE FROM a)` int(7) DEFAULT NULL,
+  `EXTRACT(DAY_SECOND FROM a)` int(9) DEFAULT NULL,
+  `EXTRACT(HOUR FROM a)` int(3) DEFAULT NULL,
+  `EXTRACT(HOUR_MINUTE FROM a)` int(5) DEFAULT NULL,
+  `EXTRACT(HOUR_SECOND FROM a)` int(7) DEFAULT NULL,
+  `EXTRACT(MINUTE FROM a)` int(3) DEFAULT NULL,
+  `EXTRACT(MINUTE_SECOND FROM a)` int(5) DEFAULT NULL,
+  `EXTRACT(SECOND FROM a)` int(3) DEFAULT NULL,
+  `EXTRACT(MICROSECOND FROM a)` int(7) DEFAULT NULL,
+  `EXTRACT(DAY_MICROSECOND FROM a)` bigint(15) DEFAULT NULL,
+  `EXTRACT(HOUR_MICROSECOND FROM a)` bigint(13) DEFAULT NULL,
+  `EXTRACT(MINUTE_MICROSECOND FROM a)` bigint(11) DEFAULT NULL,
+  `EXTRACT(SECOND_MICROSECOND FROM a)` int(9) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1,t2;
+#
+# End of 10.1 tests
+#
-- 
cgit v1.2.1


From 95c286cedf4b9330240a0a91a9fc3e58a17782b9 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Tue, 5 Jul 2016 16:53:03 +0300
Subject: MDEV-10324: Server crash in get_sel_arg_for_keypart or Assertion

The crash was caused by this problem:
get_best_group_min_max() tries to construct query plans for keys that
are not processed by the range optimizer. This wasn't a problem as long
as SEL_TREE::keys was an array of MAX_KEY elements.
However, now it is a Mem_root_array and only has elements for the used
keys, and get_best_group_min_max attempts to address beyond the end of
the array.

The obvious way to fix the crash was to port (and improve) a part of
96fcfcbd7b5120e8f64fd45985001eca8d36fbfb from mysql-5.7. This makes
get_best_group_min_max not to consider indexes that Mem_root_arrays
have no element for.

After that, I got non-sensical query plans (see MDEV-10325 for details).
Fixed that by making get_best_group_min_max to check if the index is in
table->keys_in_use_for_group_by bitmap.
---
 mysql-test/r/group_by.result        | 34 ++++++++++++++++++++++++++++++++++
 mysql-test/r/group_by_innodb.result | 35 +++++++++++++++++++++++++++++++++++
 mysql-test/r/order_by.result        |  2 +-
 3 files changed, 70 insertions(+), 1 deletion(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result
index 3ef73bb1943..adf1a3c9ab3 100644
--- a/mysql-test/r/group_by.result
+++ b/mysql-test/r/group_by.result
@@ -2692,3 +2692,37 @@ select distinct a from t1 group by 'a';
 a
 2001-02-02
 drop table t1;
+#
+# MDEV-10324: Server crash in get_sel_arg_for_keypart or Assertion `n < size()' failed in Mem_root_array
+#
+CREATE TABLE t1 (
+job_id int(10) unsigned NOT NULL AUTO_INCREMENT,
+job_cmd varbinary(60) NOT NULL DEFAULT '',
+job_namespace int(11) NOT NULL,
+job_title varbinary(255) NOT NULL,
+job_params blob NOT NULL,
+job_timestamp varbinary(14) DEFAULT NULL,
+job_random int(10) unsigned NOT NULL DEFAULT '0',
+job_token varbinary(32) NOT NULL DEFAULT '',
+job_token_timestamp varbinary(14) DEFAULT NULL,
+job_sha1 varbinary(32) NOT NULL DEFAULT '',
+job_attempts int(10) unsigned NOT NULL DEFAULT '0',
+PRIMARY KEY (job_id),
+KEY job_cmd (job_cmd,job_namespace,job_title,job_params(128)),
+KEY job_timestamp (job_timestamp),
+KEY job_sha1 (job_sha1),
+KEY job_cmd_token (job_cmd,job_token,job_random),
+KEY job_cmd_token_id (job_cmd,job_token,job_id)
+);
+INSERT INTO t1 VALUES 
+(NULL, 'foo', 1, 'foo', 'foo', 'foo', 1, 'foo', 'foo', 'foo', 1),
+(NULL, 'bar', 2, 'bar', 'bar', 'bar', 2, 'bar', 'bar', 'bar', 2);
+SELECT DISTINCT job_cmd  FROM t1 WHERE job_cmd IN ('foobar','null');
+job_cmd
+drop table t1;
+CREATE TABLE t1 (f1 INT NOT NULL, f2 VARCHAR(3) NOT NULL, KEY(f1), KEY(f2, f1));
+INSERT INTO t1 VALUES (0,'foo'),(1,'bar');
+SELECT 1 IN ( SELECT COUNT( DISTINCT f2 ) FROM t1 WHERE f1 <= 4 );
+1 IN ( SELECT COUNT( DISTINCT f2 ) FROM t1 WHERE f1 <= 4 )
+0
+drop table t1;
diff --git a/mysql-test/r/group_by_innodb.result b/mysql-test/r/group_by_innodb.result
index 381e0d7493c..bf6b25f31fa 100644
--- a/mysql-test/r/group_by_innodb.result
+++ b/mysql-test/r/group_by_innodb.result
@@ -123,4 +123,39 @@ id	xtext	optionen
 2	number	22,25
 1	select	Kabel mit Stecker 5-polig,Kabel ohne Stecker
 DROP TABLE t1, t2;
+# Port of testcase:
+#
+# Bug#20819199 ASSERTION FAILED IN TEST_IF_SKIP_SORT_ORDER
+#
+CREATE TABLE t0 ( a INT );
+INSERT INTO t0 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
+CREATE TABLE t1 (
+pk INT NOT NULL AUTO_INCREMENT,
+a INT,
+b INT,
+PRIMARY KEY (pk),
+KEY idx1 (a),
+KEY idx2 (b, a),
+KEY idx3 (a, b)
+) ENGINE = InnoDB;
+INSERT INTO t1 (a, b) SELECT t01.a, t02.a FROM t0 t01, t0 t02;
+ANALYZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+EXPLAIN SELECT DISTINCT a, MAX(b) FROM t1 WHERE a >= 0 GROUP BY a,a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	idx1,idx3	idx3	5	NULL	100	Using where; Using index
+SELECT DISTINCT a, MAX(b) FROM t1 WHERE a >= 0 GROUP BY a,a;
+a	MAX(b)
+1	10
+2	10
+3	10
+4	10
+5	10
+6	10
+7	10
+8	10
+9	10
+10	10
+DROP TABLE t0, t1;
 # End of tests
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result
index 03e7c48951a..d108bce5eb1 100644
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/r/order_by.result
@@ -1163,7 +1163,7 @@ INSERT INTO t1 SELECT a +32, b +32 FROM t1;
 INSERT INTO t1 SELECT a +64, b +64 FROM t1;
 EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR GROUP BY (a, ab) GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	NULL	ab	4	NULL	10	Using index for group-by
+1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	128	Using index
 SELECT a FROM t1 IGNORE INDEX FOR GROUP BY (a, ab) GROUP BY a;
 a
 1
-- 
cgit v1.2.1


From 4e19aa386493fcf0613049b47cbb9b151e2d3e8d Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Tue, 12 Jul 2016 12:13:31 +0200
Subject: MDEV-10318 unset params in --ps --embedded

add a test case
---
 mysql-test/r/ps_1general.result | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index 0a3d16cf48e..cc31944fd1f 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -788,3 +788,5 @@ execute stmt1;
 1
 drop prepare stmt1;
 drop table t1;
+select ?+1;
+Got one of the listed errors
-- 
cgit v1.2.1


From 31e763ddc545bda747ede3ee218f67d3a6749cfe Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Mon, 11 Jul 2016 21:29:18 +0200
Subject: MDEV-10211 : fix ssl test not to use specific value of ssl_cipher, as
 it can change between different openssl/yassl version

---
 mysql-test/r/openssl_1.result    | 10 +++++-----
 mysql-test/r/ssl.result          | 11 +++++++----
 mysql-test/r/ssl_ca.result       | 16 ++++++++--------
 mysql-test/r/ssl_compress.result | 12 ++++++------
 mysql-test/r/ssl_timeout.result  |  6 +++---
 5 files changed, 29 insertions(+), 26 deletions(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result
index dd78b1967c4..1d264bd57b1 100644
--- a/mysql-test/r/openssl_1.result
+++ b/mysql-test/r/openssl_1.result
@@ -56,8 +56,8 @@ mysqltest: Could not open connection 'default': 2026 SSL connection error: Unabl
 SHOW STATUS LIKE 'Ssl_cipher';
 Variable_name	Value
 Ssl_cipher	DHE-RSA-AES256-SHA
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+have_ssl
+1
 End of 5.0 tests
 DROP TABLE IF EXISTS thread_status;
 DROP EVENT IF EXISTS event_status;
@@ -202,9 +202,9 @@ result
 is still running; no cipher request crashed the server
 GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509;
 FLUSH PRIVILEGES;
-SHOW STATUS LIKE 'Ssl_cipher';
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
+have_ssl
+1
 DROP USER bug42158@localhost;
 End of 5.1 tests
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result
index 57427a228eb..2b4bb419643 100644
--- a/mysql-test/r/ssl.result
+++ b/mysql-test/r/ssl.result
@@ -1,6 +1,9 @@
 SHOW STATUS LIKE 'Ssl_cipher';
 Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+Ssl_cipher	AES128-GCM-SHA256
+SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
+have_ssl
+1
 SHOW STATUS LIKE 'Ssl_server_not_before';
 Variable_name	Value
 Ssl_server_not_before	Apr 25 14:55:05 2015 GMT
@@ -2163,9 +2166,9 @@ Privat (Private Nutzung)	Mobilfunk
 Warnings:
 Warning	1052	Column 'kundentyp' in group statement is ambiguous
 drop table t1;
-SHOW STATUS LIKE 'Ssl_cipher';
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
+have_ssl
+1
 select aes_decrypt('MySQL','adf');
 aes_decrypt('MySQL','adf')
 NULL
diff --git a/mysql-test/r/ssl_ca.result b/mysql-test/r/ssl_ca.result
index ffc5671f85f..83a98902581 100644
--- a/mysql-test/r/ssl_ca.result
+++ b/mysql-test/r/ssl_ca.result
@@ -4,21 +4,21 @@
 # try to connect with wrong '--ssl-ca' path : should fail
 ERROR 2026 (HY000): SSL connection error: SSL_CTX_set_default_verify_paths failed
 # try to connect with correct '--ssl-ca' path : should connect
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+have_ssl
+1
 #
 # Bug#21920678: SSL-CA DOES NOT ACCEPT ~USER TILDE HOME DIRECTORY
 #               PATH SUBSTITUTION
 #
 # try to connect with '--ssl-ca' option using tilde home directoy
 # path substitution : should connect
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+have_ssl
+1
 # try to connect with '--ssl-key' option using tilde home directoy
 # path substitution : should connect
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+have_ssl
+1
 # try to connect with '--ssl-cert' option using tilde home directoy
 # path substitution : should connect
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+have_ssl
+1
diff --git a/mysql-test/r/ssl_compress.result b/mysql-test/r/ssl_compress.result
index 31f484ab58c..d6a65c2b06d 100644
--- a/mysql-test/r/ssl_compress.result
+++ b/mysql-test/r/ssl_compress.result
@@ -1,6 +1,6 @@
-SHOW STATUS LIKE 'Ssl_cipher';
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
+have_ssl
+1
 SHOW STATUS LIKE 'Compression';
 Variable_name	Value
 Compression	ON
@@ -2160,9 +2160,9 @@ Privat (Private Nutzung)	Mobilfunk
 Warnings:
 Warning	1052	Column 'kundentyp' in group statement is ambiguous
 drop table t1;
-SHOW STATUS LIKE 'Ssl_cipher';
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
+have_ssl
+1
 SHOW STATUS LIKE 'Compression';
 Variable_name	Value
 Compression	ON
diff --git a/mysql-test/r/ssl_timeout.result b/mysql-test/r/ssl_timeout.result
index 356e931ba4d..d9ef0f7a16f 100644
--- a/mysql-test/r/ssl_timeout.result
+++ b/mysql-test/r/ssl_timeout.result
@@ -1,7 +1,7 @@
 # connect with read timeout so SLEEP() should timeout
 # Check ssl turned on
-SHOW STATUS LIKE 'Ssl_cipher';
-Variable_name	Value
-Ssl_cipher	DHE-RSA-AES256-SHA
+SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
+have_ssl
+1
 SELECT SLEEP(600);
 ERROR HY000: Lost connection to MySQL server during query
-- 
cgit v1.2.1


From 3e8ae6ef4f08937332e6ad317f37a9c0c9a717d3 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Tue, 12 Jul 2016 12:36:11 +0200
Subject: MDEV-10211 postfix - in ssl.test, remove remaining SHOW STATUS LIKE
 'Ssl_cipher'

---
 mysql-test/r/ssl.result | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result
index 2b4bb419643..4bae442459a 100644
--- a/mysql-test/r/ssl.result
+++ b/mysql-test/r/ssl.result
@@ -1,6 +1,3 @@
-SHOW STATUS LIKE 'Ssl_cipher';
-Variable_name	Value
-Ssl_cipher	AES128-GCM-SHA256
 SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
 have_ssl
 1
-- 
cgit v1.2.1


From 0bb5d955423c2a7b29eab02e7bf6194ae003ae75 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Mon, 11 Jul 2016 22:01:24 +0300
Subject: MDEV-10325: Queries examines all rows of a tables when it should not

The problem was introduced by 1859caf60b725f81f2ac6091eb44cb848a4a439a:
  MDEV-10175: range optimizer calls records_in_range() for full extended keys

  Make the range optimizer not call records_in_range() when it would
  not give any benefit.

that patch used an incorrect way to check for full extended key. Now fixing
the check.
---
 mysql-test/r/innodb_ext_key.result | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/innodb_ext_key.result b/mysql-test/r/innodb_ext_key.result
index cae402a9f12..bd4bdb28fff 100644
--- a/mysql-test/r/innodb_ext_key.result
+++ b/mysql-test/r/innodb_ext_key.result
@@ -1040,5 +1040,29 @@ a
 1
 drop table t1, t2;
 set optimizer_switch=@save_optimizer_switch;
+# 
+# MDEV-10325: Queries examines all rows of a tables when it should not
+# 
+create table t0 (a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t1 (
+pk int not null,
+col1 varchar(32),
+filler varchar(100),
+key idx1(col1(10)),
+primary key (pk)
+)engine=innodb;
+insert into t1 
+select
+A.a + 10*B.a + 100*C.a,
+concat('1234567890-', 1000+ A.a + 10*B.a + 100*C.a),
+repeat('filler-data-', 4)
+from 
+t0 A, t0 B, t0 C;
+# The following must use type=ALL (and NOT type=ref, rows=1)
+explain select * from t1 where col1='1234567890-a';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	idx1	NULL	NULL	NULL	#	Using where
+drop table t0,t1;
 set optimizer_switch=@save_ext_key_optimizer_switch;
 SET SESSION STORAGE_ENGINE=DEFAULT;
-- 
cgit v1.2.1


From 8a8ba1949bf4bdc1dd6504d88d20cfa3ef2c0794 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Mon, 11 Jul 2016 22:22:32 +0300
Subject: MDEV-10360: Extended keys: index properties depend on index order

TABLE_SHARE::init_from_binary_frm_image has a rule: if an index
has a partially-covered column (like in "KEY(col(N))" ), then dont
provide "Extended Keys" feature for this index.

The problem was that due to coding error Extended Keys feature was
disabled for *ALL* subsequent indexes. Fixed the error.
---
 mysql-test/r/innodb_ext_key.result | 45 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/innodb_ext_key.result b/mysql-test/r/innodb_ext_key.result
index bd4bdb28fff..c0b91c88d8a 100644
--- a/mysql-test/r/innodb_ext_key.result
+++ b/mysql-test/r/innodb_ext_key.result
@@ -1064,5 +1064,50 @@ explain select * from t1 where col1='1234567890-a';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	idx1	NULL	NULL	NULL	#	Using where
 drop table t0,t1;
+# 
+# MDEV-10360: Extended keys: index properties depend on index order
+# 
+create table t0 (a int);
+insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+create table t1 (
+index_id bigint(20) unsigned NOT NULL,
+index_class varchar(265) COLLATE latin1_general_ci DEFAULT NULL ,
+index_object_id int(10) unsigned NOT NULL DEFAULT '0' ,
+index_date_updated int(10) unsigned DEFAULT NULL ,
+PRIMARY KEY (index_id),
+KEY object (index_class(181),index_object_id),
+KEY index_date_updated (index_date_updated)
+) engine=innodb;
+create table t2 (
+index_id bigint(20) unsigned NOT NULL,
+index_class varchar(265) COLLATE latin1_general_ci DEFAULT NULL ,
+index_object_id int(10) unsigned NOT NULL DEFAULT '0' ,
+index_date_updated int(10) unsigned DEFAULT NULL ,
+PRIMARY KEY (index_id),
+KEY index_date_updated (index_date_updated),
+KEY object (index_class(181),index_object_id)
+) engine=innodb;
+insert into t1 select 
+@a:=A.a + 10*B.a + 100*C.a,
+concat('val-', @a),
+123456,
+A.a + 10*B.a
+from 
+t0 A, t0 B, t0 C;
+insert into t2 select * from t1;
+# This must have the same query plan as the query below it:
+# type=range, key=index_date_updated, key_len=13
+explain 
+select * from t1 force index(index_date_updated) 
+where index_date_updated= 10 and index_id < 800;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	index_date_updated	index_date_updated	13	NULL	#	Using index condition
+# This used to work from the start:
+explain 
+select * from t2 force index(index_date_updated) 
+where index_date_updated= 10 and index_id < 800;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	range	index_date_updated	index_date_updated	13	NULL	#	Using index condition
+drop table t0,t1,t2;
 set optimizer_switch=@save_ext_key_optimizer_switch;
 SET SESSION STORAGE_ENGINE=DEFAULT;
-- 
cgit v1.2.1


From 12ac3ee11e8bc433432a2b3ba1bb79ea2e2d9965 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Wed, 13 Jul 2016 14:47:58 +0300
Subject: Update test results: make innodb_ext_key test stable

---
 mysql-test/r/innodb_ext_key.result | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/innodb_ext_key.result b/mysql-test/r/innodb_ext_key.result
index c0b91c88d8a..f800676c863 100644
--- a/mysql-test/r/innodb_ext_key.result
+++ b/mysql-test/r/innodb_ext_key.result
@@ -1059,10 +1059,6 @@ concat('1234567890-', 1000+ A.a + 10*B.a + 100*C.a),
 repeat('filler-data-', 4)
 from 
 t0 A, t0 B, t0 C;
-# The following must use type=ALL (and NOT type=ref, rows=1)
-explain select * from t1 where col1='1234567890-a';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	idx1	NULL	NULL	NULL	#	Using where
 drop table t0,t1;
 # 
 # MDEV-10360: Extended keys: index properties depend on index order
-- 
cgit v1.2.1


From bf2e31500c9a0a7fcdccfb724e9447347a3ab684 Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@askmonty.org>
Date: Mon, 18 Jul 2016 11:50:08 +0400
Subject: MDEV-8569 build_table_filename() doesn't support temporary tables.

        Temporary tables support added for RENAME and ALTER TABLE.
---
 mysql-test/r/grant2.result     | 2 +-
 mysql-test/r/temp_table.result | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index 3df9a5480d3..9e9b3ffc4e5 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@@ -708,7 +708,7 @@ mysqltest_db1.t3	preload_keys	status	OK
 # RENAME (doesn't work for temporary tables, thus should fail).
 #
 RENAME TABLE t3 TO t3_1;
-ERROR 42000: DROP, ALTER command denied to user 'mysqltest_u1'@'localhost' for table 't3'
+ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_u1'@'localhost' for table 't3_1'
 #
 # HANDLER OPEN/READ/CLOSE.
 #
diff --git a/mysql-test/r/temp_table.result b/mysql-test/r/temp_table.result
index 0a1701be0d7..dd8bab31d75 100644
--- a/mysql-test/r/temp_table.result
+++ b/mysql-test/r/temp_table.result
@@ -291,3 +291,6 @@ test.t1	repair	status	OK
 test.t2	repair	status	OK
 test.t3	repair	status	OK
 DROP TABLES t1, t2, t3;
+CREATE TEMPORARY TABLE t1 (a int);
+RENAME TABLE t1 TO t2;
+DROP TABLE t2;
-- 
cgit v1.2.1


From 1b5da2ca49f69605ccfe4d98e9207e7b8551e21f Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svoj@mariadb.org>
Date: Thu, 21 Jul 2016 15:32:28 +0400
Subject: MDEV-10316 - main.type_date fails around midnight sporadically

A better fix for MySQL Bug#41776: use hard timestamp rather than unreliable
sleep.
---
 mysql-test/r/type_date.result | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/type_date.result b/mysql-test/r/type_date.result
index ecbda1d13e6..ad7560fa3f8 100644
--- a/mysql-test/r/type_date.result
+++ b/mysql-test/r/type_date.result
@@ -165,6 +165,7 @@ str_to_date( '', a )
 NULL
 DROP TABLE t1;
 CREATE TABLE t1 (a DATE, b INT, PRIMARY KEY (a,b));
+SET timestamp=UNIX_TIMESTAMP('2016-07-21 14:48:18');
 INSERT INTO t1 VALUES (DATE(NOW()), 1);
 SELECT COUNT(*) FROM t1 WHERE a = NOW();
 COUNT(*)
@@ -192,6 +193,7 @@ COUNT(*)
 EXPLAIN SELECT COUNT(*) FROM t1 WHERE a = NOW();
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
+SET timestamp=DEFAULT;
 DROP TABLE t1;
 CREATE TABLE t1 (a DATE);
 CREATE TABLE t2 (a DATE);
-- 
cgit v1.2.1


From a52d3aa831454aa2e7dd4dfde9c65d4b87532caa Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Wed, 22 Jun 2016 11:17:44 +0200
Subject: MDEV-10045: Server crashes in Time_and_counter_tracker::incr_loops

Do not set 'optimized' flag until whole optimization procedure is finished.
---
 mysql-test/r/subselect.result                 | 16 ++++++++++++++++
 mysql-test/r/subselect_no_exists_to_in.result | 16 ++++++++++++++++
 mysql-test/r/subselect_no_mat.result          | 16 ++++++++++++++++
 mysql-test/r/subselect_no_opts.result         | 16 ++++++++++++++++
 mysql-test/r/subselect_no_scache.result       | 16 ++++++++++++++++
 mysql-test/r/subselect_no_semijoin.result     | 16 ++++++++++++++++
 6 files changed, 96 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 6a531997d79..428cf89c36c 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -7157,5 +7157,21 @@ INSERT INTO t1 VALUES ('foo');
 SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' );
 f
 foo
+SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar');
+f
+foo
 drop table t1;
 SET NAMES default;
+#
+# MDEV-10045: Server crashes in Time_and_counter_tracker::incr_loops
+#
+SET NAMES utf8;
+CREATE TABLE t1 (f1 VARCHAR(3), f2 INT UNSIGNED) ENGINE=MyISAM;
+CREATE TABLE t2 (f3 INT) ENGINE=MyISAM;
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo' UNION SELECT 'bar' );
+f1	f2	f3
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
+f1	f2	f3
+DROP TABLE t1, t2;
+SET NAMES default;
+End of 10.1 tests
diff --git a/mysql-test/r/subselect_no_exists_to_in.result b/mysql-test/r/subselect_no_exists_to_in.result
index aa6843409c0..b24edd438b2 100644
--- a/mysql-test/r/subselect_no_exists_to_in.result
+++ b/mysql-test/r/subselect_no_exists_to_in.result
@@ -7157,8 +7157,24 @@ INSERT INTO t1 VALUES ('foo');
 SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' );
 f
 foo
+SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar');
+f
+foo
 drop table t1;
 SET NAMES default;
+#
+# MDEV-10045: Server crashes in Time_and_counter_tracker::incr_loops
+#
+SET NAMES utf8;
+CREATE TABLE t1 (f1 VARCHAR(3), f2 INT UNSIGNED) ENGINE=MyISAM;
+CREATE TABLE t2 (f3 INT) ENGINE=MyISAM;
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo' UNION SELECT 'bar' );
+f1	f2	f3
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
+f1	f2	f3
+DROP TABLE t1, t2;
+SET NAMES default;
+End of 10.1 tests
 set optimizer_switch=default;
 select @@optimizer_switch like '%exists_to_in=off%';
 @@optimizer_switch like '%exists_to_in=off%'
diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result
index 754aec1db20..23b8ade7ef5 100644
--- a/mysql-test/r/subselect_no_mat.result
+++ b/mysql-test/r/subselect_no_mat.result
@@ -7150,8 +7150,24 @@ INSERT INTO t1 VALUES ('foo');
 SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' );
 f
 foo
+SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar');
+f
+foo
 drop table t1;
 SET NAMES default;
+#
+# MDEV-10045: Server crashes in Time_and_counter_tracker::incr_loops
+#
+SET NAMES utf8;
+CREATE TABLE t1 (f1 VARCHAR(3), f2 INT UNSIGNED) ENGINE=MyISAM;
+CREATE TABLE t2 (f3 INT) ENGINE=MyISAM;
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo' UNION SELECT 'bar' );
+f1	f2	f3
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
+f1	f2	f3
+DROP TABLE t1, t2;
+SET NAMES default;
+End of 10.1 tests
 set optimizer_switch=default;
 select @@optimizer_switch like '%materialization=on%';
 @@optimizer_switch like '%materialization=on%'
diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
index e05dd4d140d..2907fd3f4b3 100644
--- a/mysql-test/r/subselect_no_opts.result
+++ b/mysql-test/r/subselect_no_opts.result
@@ -7148,6 +7148,22 @@ INSERT INTO t1 VALUES ('foo');
 SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' );
 f
 foo
+SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar');
+f
+foo
 drop table t1;
 SET NAMES default;
+#
+# MDEV-10045: Server crashes in Time_and_counter_tracker::incr_loops
+#
+SET NAMES utf8;
+CREATE TABLE t1 (f1 VARCHAR(3), f2 INT UNSIGNED) ENGINE=MyISAM;
+CREATE TABLE t2 (f3 INT) ENGINE=MyISAM;
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo' UNION SELECT 'bar' );
+f1	f2	f3
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
+f1	f2	f3
+DROP TABLE t1, t2;
+SET NAMES default;
+End of 10.1 tests
 set @optimizer_switch_for_subselect_test=null;
diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result
index 71ade62b423..08394bc6332 100644
--- a/mysql-test/r/subselect_no_scache.result
+++ b/mysql-test/r/subselect_no_scache.result
@@ -7163,8 +7163,24 @@ INSERT INTO t1 VALUES ('foo');
 SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' );
 f
 foo
+SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar');
+f
+foo
 drop table t1;
 SET NAMES default;
+#
+# MDEV-10045: Server crashes in Time_and_counter_tracker::incr_loops
+#
+SET NAMES utf8;
+CREATE TABLE t1 (f1 VARCHAR(3), f2 INT UNSIGNED) ENGINE=MyISAM;
+CREATE TABLE t2 (f3 INT) ENGINE=MyISAM;
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo' UNION SELECT 'bar' );
+f1	f2	f3
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
+f1	f2	f3
+DROP TABLE t1, t2;
+SET NAMES default;
+End of 10.1 tests
 set optimizer_switch=default;
 select @@optimizer_switch like '%subquery_cache=on%';
 @@optimizer_switch like '%subquery_cache=on%'
diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result
index 43d191b1225..9b1d4d24031 100644
--- a/mysql-test/r/subselect_no_semijoin.result
+++ b/mysql-test/r/subselect_no_semijoin.result
@@ -7148,7 +7148,23 @@ INSERT INTO t1 VALUES ('foo');
 SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar' UNION SELECT 'baz' );
 f
 foo
+SELECT f FROM t1 WHERE f > ALL ( SELECT 'bar');
+f
+foo
 drop table t1;
 SET NAMES default;
+#
+# MDEV-10045: Server crashes in Time_and_counter_tracker::incr_loops
+#
+SET NAMES utf8;
+CREATE TABLE t1 (f1 VARCHAR(3), f2 INT UNSIGNED) ENGINE=MyISAM;
+CREATE TABLE t2 (f3 INT) ENGINE=MyISAM;
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo' UNION SELECT 'bar' );
+f1	f2	f3
+SELECT * FROM t1, t2 WHERE f3 = f2 AND f1 > ANY ( SELECT 'foo');
+f1	f2	f3
+DROP TABLE t1, t2;
+SET NAMES default;
+End of 10.1 tests
 set @optimizer_switch_for_subselect_test=null;
 set @join_cache_level_for_subselect_test=NULL;
-- 
cgit v1.2.1


From df4fddb8961355fc68f32375d2bac5735057f205 Mon Sep 17 00:00:00 2001
From: Elena Stepanova <elenst@mariadb.com>
Date: Mon, 25 Jul 2016 01:57:00 +0300
Subject: MDEV-10428 main.information_schema_stats fails sporadically in
 buildbot

Resultsets which contain more than one row need to be sorted
---
 mysql-test/r/information_schema_stats.result | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/information_schema_stats.result b/mysql-test/r/information_schema_stats.result
index cd73636879c..bc2ce9f0294 100644
--- a/mysql-test/r/information_schema_stats.result
+++ b/mysql-test/r/information_schema_stats.result
@@ -16,8 +16,8 @@ count(*)
 2
 select * from information_schema.index_statistics where table_schema='test' and table_name='just_a_test';
 TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ
-test	just_a_test	IND_just_a_test_state	2
 test	just_a_test	IND_just_a_test_first_name_last_name	1
+test	just_a_test	IND_just_a_test_state	2
 select * from information_schema.table_statistics where table_schema='test' and table_name='just_a_test';
 TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES
 test	just_a_test	18	5	5
@@ -56,9 +56,9 @@ count(*)
 3
 select * from information_schema.index_statistics where table_schema='test' and table_name='just_a_test';
 TABLE_SCHEMA	TABLE_NAME	INDEX_NAME	ROWS_READ
+test	just_a_test	PRIMARY	5
 test	just_a_test	first_name	1
 test	just_a_test	state	2
-test	just_a_test	PRIMARY	5
 select * from information_schema.table_statistics where table_schema='test' and table_name='just_a_test';
 TABLE_SCHEMA	TABLE_NAME	ROWS_READ	ROWS_CHANGED	ROWS_CHANGED_X_INDEXES
 test	just_a_test	8	5	15
-- 
cgit v1.2.1


From 15ef38d2ea97575c71b83db6669ee20000c23a6b Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Wed, 27 Jul 2016 00:38:51 +0300
Subject: MDEV-10228: Delete missing rows with OR conditions

Fix get_quick_keys(): When building range tree from a condition
in form

  keypart1=const AND (keypart2 < 0 OR keypart2>=0)

the SEL_ARG for keypart2 represents an interval (-inf, +inf).
However, the logic that sets UNIQUE_RANGE flag fails to recognize
this, and sets UNIQUE_RANGE flag if (keypart1, keypart2) covered
a unique key.
As a result, range access executor assumes the interval can have
at most one row and only reads the first row from it.
---
 mysql-test/r/range.result | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result
index a19d906b645..630a692cef6 100644
--- a/mysql-test/r/range.result
+++ b/mysql-test/r/range.result
@@ -2113,3 +2113,34 @@ a	b
 0	0
 1	1
 drop table t2;
+#
+# MDEV-10228: Delete missing rows with OR conditions
+#  (The example uses UPDATE, because UPDATE allows to use index hints
+#   and so it's possible to make an example that works with any storage
+#   engine)
+#
+CREATE TABLE t1 (
+key1varchar varchar(14) NOT NULL,
+key2int int(11) NOT NULL DEFAULT '0',
+col1 int,
+PRIMARY KEY (key1varchar,key2int),
+KEY key1varchar (key1varchar),
+KEY key2int (key2int)
+) DEFAULT CHARSET=utf8;
+insert into t1 values 
+('value1',0, 0),
+('value1',1, 0),
+('value1',1000685, 0),
+('value1',1003560, 0),
+('value1',1004807, 0);
+update t1 force index (PRIMARY) set col1=12345
+where (key1varchar='value1' AND (key2int <=1 OR  key2int > 1));
+# The following must show col1=12345 for all rows:
+select * from t1;
+key1varchar	key2int	col1
+value1	0	12345
+value1	1	12345
+value1	1000685	12345
+value1	1003560	12345
+value1	1004807	12345
+drop table t1;
-- 
cgit v1.2.1


From 5d0dfcbecb3026fc105bd0dcc7a9b2a5c9536130 Mon Sep 17 00:00:00 2001
From: iangilfillan <github@greenman.co.za>
Date: Wed, 27 Jul 2016 15:29:32 +0200
Subject: Update contributors

---
 mysql-test/r/contributors.result | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/contributors.result b/mysql-test/r/contributors.result
index 1e01ca81990..03f5ad2ab15 100644
--- a/mysql-test/r/contributors.result
+++ b/mysql-test/r/contributors.result
@@ -1,13 +1,14 @@
 SHOW CONTRIBUTORS;
 Name	Location	Comment
-Booking.com	http://www.booking.com	Founding member of the MariaDB Foundation
-MariaDB Corporation	https://mariadb.com	Founding member of the MariaDB Foundation
-Auttomattic	http://automattic.com	Member of the MariaDB Foundation
-Visma	http://visma.com	Member of the MariaDB Foundation
-Nexedi	http://www.nexedi.com	Member of the MariaDB Foundation
-Acronis	http://www.acronis.com	Member of the MariaDB Foundation
-Verkkokauppa.com	Finland	Sponsor of the MariaDB Foundation
-Virtuozzo	https://virtuozzo.com/	Sponsor of the MariaDB Foundation
+Booking.com	http://www.booking.com	Founding member, Platinum Sponsor of the MariaDB Foundation
+MariaDB Corporation	https://mariadb.com	Founding member, Gold Sponsor of the MariaDB Foundation
+Visma   http://visma.com	Gold Sponsor of the MariaDB Foundation
+DBS	http://dbs.com	Gold Sponsor of the MariaDB Foundation
+Nexedi	https://www.nexedi.com	Silver Sponsor of the MariaDB Foundation
+Acronis	http://www.acronis.com	Silver Sponsor of the MariaDB Foundation
+Auttomattic     https://automattic.com  Bronze Sponsor of the MariaDB Foundation
+Verkkokauppa.com	https://virtuozzo.com	Bronze Sponsor of the MariaDB Foundation
+Virtuozzo	https://virtuozzo.com/	Bronze Sponsor of the MariaDB Foundation
 Google	USA	Sponsoring encryption, parallel replication and GTID
 Facebook	USA	Sponsoring non-blocking API, LIMIT ROWS EXAMINED etc
 Ronald Bradford	Brisbane, Australia	EFF contribution for UC2006 Auction
-- 
cgit v1.2.1


From a63ceaeab10fc1fc72f5853ce14b278da95579b4 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Wed, 27 Jul 2016 17:01:45 +0300
Subject: MDEV-10389: Query returns different results on a debug vs non-debug
 build

The problem was caused by a merged semi-join, which contained a non-merged
semi-join, which used references to the top-level query in the left_expr.

When moving non-merged semi-join from the subquery to its parent, do not
forget to call fix_after_pullout for its Item_subselect. We need to do
that specifically, because non-merged semi-joins do not have their
IN-equality in the WHERE clause at this stage.
---
 mysql-test/r/subselect_mat.result    | 13 +++++++++++++
 mysql-test/r/subselect_sj_mat.result | 13 +++++++++++++
 2 files changed, 26 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/subselect_mat.result b/mysql-test/r/subselect_mat.result
index c9fa7c0c672..d0c5c2eda26 100644
--- a/mysql-test/r/subselect_mat.result
+++ b/mysql-test/r/subselect_mat.result
@@ -2261,6 +2261,19 @@ PREPARE stmt FROM '
 EXECUTE stmt;
 EXECUTE stmt;
 DROP TABLE t1,t2,t3;
+#
+# MDEV-10389: Query returns different results on a debug vs non-debug build of the same revision
+#
+CREATE TABLE t1 (i1 INT, i2 INT NOT NULL);
+INSERT INTO t1 VALUES (1,4),(2,6);
+SELECT * FROM t1 AS alias1
+WHERE alias1.i1 IN (
+SELECT i1 FROM t1 WHERE alias1.i2 IN ( SELECT i2 FROM t1 HAVING i2 <> 7 )
+);
+i1	i2
+1	4
+2	6
+DROP TABLE t1;
 set @subselect_mat_test_optimizer_switch_value=null;
 set @@optimizer_switch='materialization=on,in_to_exists=off,semijoin=off';
 set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
diff --git a/mysql-test/r/subselect_sj_mat.result b/mysql-test/r/subselect_sj_mat.result
index 2f3777a47fd..e846549f406 100644
--- a/mysql-test/r/subselect_sj_mat.result
+++ b/mysql-test/r/subselect_sj_mat.result
@@ -2301,3 +2301,16 @@ PREPARE stmt FROM '
 EXECUTE stmt;
 EXECUTE stmt;
 DROP TABLE t1,t2,t3;
+#
+# MDEV-10389: Query returns different results on a debug vs non-debug build of the same revision
+#
+CREATE TABLE t1 (i1 INT, i2 INT NOT NULL);
+INSERT INTO t1 VALUES (1,4),(2,6);
+SELECT * FROM t1 AS alias1
+WHERE alias1.i1 IN (
+SELECT i1 FROM t1 WHERE alias1.i2 IN ( SELECT i2 FROM t1 HAVING i2 <> 7 )
+);
+i1	i2
+1	4
+2	6
+DROP TABLE t1;
-- 
cgit v1.2.1


From c6aaa2adbefa04463bb9b67264c09a04b9c4bfcd Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Sat, 30 Jul 2016 10:53:01 +0300
Subject: MDEV-10228: update test results

---
 mysql-test/r/range_mrr_icp.result | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/range_mrr_icp.result b/mysql-test/r/range_mrr_icp.result
index 9a089106c76..3f5de5b0189 100644
--- a/mysql-test/r/range_mrr_icp.result
+++ b/mysql-test/r/range_mrr_icp.result
@@ -2115,4 +2115,35 @@ a	b
 0	0
 1	1
 drop table t2;
+#
+# MDEV-10228: Delete missing rows with OR conditions
+#  (The example uses UPDATE, because UPDATE allows to use index hints
+#   and so it's possible to make an example that works with any storage
+#   engine)
+#
+CREATE TABLE t1 (
+key1varchar varchar(14) NOT NULL,
+key2int int(11) NOT NULL DEFAULT '0',
+col1 int,
+PRIMARY KEY (key1varchar,key2int),
+KEY key1varchar (key1varchar),
+KEY key2int (key2int)
+) DEFAULT CHARSET=utf8;
+insert into t1 values 
+('value1',0, 0),
+('value1',1, 0),
+('value1',1000685, 0),
+('value1',1003560, 0),
+('value1',1004807, 0);
+update t1 force index (PRIMARY) set col1=12345
+where (key1varchar='value1' AND (key2int <=1 OR  key2int > 1));
+# The following must show col1=12345 for all rows:
+select * from t1;
+key1varchar	key2int	col1
+value1	0	12345
+value1	1	12345
+value1	1000685	12345
+value1	1003560	12345
+value1	1004807	12345
+drop table t1;
 set optimizer_switch=@mrr_icp_extra_tmp;
-- 
cgit v1.2.1


From 5fdb3cfcd432b85dc305a1a61c2d018a798a6ac3 Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Fri, 29 Jul 2016 18:21:08 +0200
Subject: MDEV-10419: crash in mariadb 10.1.16-MariaDB-1~trusty

Fixed initialization and usage of THD reference in subselect engines.
---
 mysql-test/r/view.result | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index dbfdf3f0f56..6848ba30245 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -5520,6 +5520,21 @@ test.v1	check	Error	'test.v1' is not BASE TABLE
 test.v1	check	status	Operation failed
 drop view v1;
 drop table t1;
+#
+# MDEV-10419: crash in mariadb 10.1.16-MariaDB-1~trusty
+#
+CREATE TABLE t1 (c1 CHAR(13));
+CREATE TABLE t2 (c2 CHAR(13));
+CREATE FUNCTION f() RETURNS INT RETURN 0;
+CREATE OR REPLACE VIEW v1 AS select f() from t1 where c1 in (select c2 from t2);
+DROP FUNCTION f;
+SHOW CREATE VIEW v1;
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `f`() AS `f()` from `t1` where `test`.`t1`.`c1` in (select `test`.`t2`.`c2` from `t2`)	latin1	latin1_swedish_ci
+Warnings:
+Warning	1356	View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
+drop view v1;
+drop table t1,t2;
 # -----------------------------------------------------------------
 # -- End of 5.5 tests.
 # -----------------------------------------------------------------
-- 
cgit v1.2.1


From 84a9e05003e2af253b6e4679cc85a0f0d624c49a Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Mon, 1 Aug 2016 12:19:29 +0300
Subject: MDEV-10470: main.derived fails, buildbot is broken - Update test
 result (checked)

---
 mysql-test/r/derived.result | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result
index 1d643333424..08709c6def0 100644
--- a/mysql-test/r/derived.result
+++ b/mysql-test/r/derived.result
@@ -621,13 +621,13 @@ SELECT f3 FROM t2 HAVING f3 >= 8
 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	<derived2>	system	NULL	NULL	NULL	NULL	1	100.00	
-1	PRIMARY	<subquery4>	eq_ref	distinct_key	distinct_key	4	sq.f2	1	100.00	
+1	PRIMARY	<subquery4>	eq_ref	distinct_key	distinct_key	4	const	1	100.00	
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where; FirstMatch(<subquery4>); Using join buffer (flat, BNL join)
 4	MATERIALIZED	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
 2	DERIVED	t1	system	NULL	NULL	NULL	NULL	1	100.00	
 Warnings:
 Note	1276	Field or reference 'sq.f2' of SELECT #3 was resolved in SELECT #1
-Note	1003	select 6 AS `f1` from  <materialize> (select `test`.`t2`.`f3` from `test`.`t2` having (`test`.`t2`.`f3` >= 8)) semi join (`test`.`t2`) where ((`test`.`t2`.`f3` = 6) and (9 = `<subquery4>`.`f3`))
+Note	1003	select 6 AS `f1` from  <materialize> (select `test`.`t2`.`f3` from `test`.`t2` having (`test`.`t2`.`f3` >= 8)) semi join (`test`.`t2`) where ((`test`.`t2`.`f3` = 6) and (`<subquery4>`.`f3` = 9))
 DROP TABLE t2,t1;
 #
 # MDEV-9462: Out of memory using explain on 2 empty tables 
-- 
cgit v1.2.1


From b5fb2a685b6ec67d37033b020a8145d1aac1fc93 Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svoj@mariadb.org>
Date: Tue, 2 Aug 2016 14:29:55 +0400
Subject: Fixed main.contributors failure

---
 mysql-test/r/contributors.result | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/contributors.result b/mysql-test/r/contributors.result
index 03f5ad2ab15..918ceaa496f 100644
--- a/mysql-test/r/contributors.result
+++ b/mysql-test/r/contributors.result
@@ -2,11 +2,11 @@ SHOW CONTRIBUTORS;
 Name	Location	Comment
 Booking.com	http://www.booking.com	Founding member, Platinum Sponsor of the MariaDB Foundation
 MariaDB Corporation	https://mariadb.com	Founding member, Gold Sponsor of the MariaDB Foundation
-Visma   http://visma.com	Gold Sponsor of the MariaDB Foundation
+Visma	http://visma.com	Gold Sponsor of the MariaDB Foundation
 DBS	http://dbs.com	Gold Sponsor of the MariaDB Foundation
 Nexedi	https://www.nexedi.com	Silver Sponsor of the MariaDB Foundation
 Acronis	http://www.acronis.com	Silver Sponsor of the MariaDB Foundation
-Auttomattic     https://automattic.com  Bronze Sponsor of the MariaDB Foundation
+Auttomattic	https://automattic.com	Bronze Sponsor of the MariaDB Foundation
 Verkkokauppa.com	https://virtuozzo.com	Bronze Sponsor of the MariaDB Foundation
 Virtuozzo	https://virtuozzo.com/	Bronze Sponsor of the MariaDB Foundation
 Google	USA	Sponsoring encryption, parallel replication and GTID
-- 
cgit v1.2.1


From ecb7ce7844237e2366ab5e8d9963f370cb1042aa Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.org>
Date: Wed, 3 Aug 2016 15:55:48 +0400
Subject: MDEV-10467 Assertion `nr >= 0.0' failed in Item_sum_std::val_real()
 Backporting MDEV-5781 from 10.0.

---
 mysql-test/r/func_math.result | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index d122d435ac7..66bbb25b309 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -761,3 +761,15 @@ select 5 div 2.0;
 select 5.9 div 2, 1.23456789e3 DIV 2, 1.23456789e9 DIV 2, 1.23456789e19 DIV 2;
 5.9 div 2	1.23456789e3 DIV 2	1.23456789e9 DIV 2	1.23456789e19 DIV 2
 2	617	617283945	6172839450000000000
+#
+# MDEV-10467 Assertion `nr >= 0.0' failed in Item_sum_std::val_real()
+#
+CREATE TABLE t1 (i INT);
+INSERT INTO t1 VALUES (1),(2);
+SELECT STDDEV_SAMP(ROUND('0', 309)) FROM t1;
+STDDEV_SAMP(ROUND('0', 309))
+0
+DROP TABLE t1;
+#
+# End of 5.5 tests
+#
-- 
cgit v1.2.1


From 93d5cdf03f22df5cc6e071edd623a00f82b0e6e7 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Thu, 4 Aug 2016 13:14:45 +0300
Subject: MDEV-9946: main.xtradb_mrr fails sporadically

Make the testcase stable by adding FORCE INDEX
---
 mysql-test/r/xtradb_mrr.result | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/xtradb_mrr.result b/mysql-test/r/xtradb_mrr.result
index 15b750d2fd3..c238d0530af 100644
--- a/mysql-test/r/xtradb_mrr.result
+++ b/mysql-test/r/xtradb_mrr.result
@@ -311,10 +311,10 @@ concat('c-', 1000 + C.a, '-c'),
 'filler'
 from t1 A, t1 B, t1 C;
 explain
-select count(length(a) + length(filler)) from t2 where a>='a-1000-a' and a <'a-1001-a';
+select count(length(a) + length(filler)) from t2 force index (a) where a>='a-1000-a' and a <'a-1001-a';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	range	a	a	9	NULL	99	Using index condition; Rowid-ordered scan
-select count(length(a) + length(filler)) from t2 where a>='a-1000-a' and a <'a-1001-a';
+select count(length(a) + length(filler)) from t2 force index (a) where a>='a-1000-a' and a <'a-1001-a';
 count(length(a) + length(filler))
 100
 drop table t2;
-- 
cgit v1.2.1


From 5e23b6344f3b229edcb0d9c42ec23b689c329a38 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sun, 7 Aug 2016 11:02:42 +0200
Subject: MDEV-10506 Protocol::end_statement(): Assertion `0' failed upon ALTER
 TABLE

thd->clear_error() destroyed already existing error status
---
 mysql-test/r/myisam_enable_keys-10506.result | 114 +++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 mysql-test/r/myisam_enable_keys-10506.result

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/myisam_enable_keys-10506.result b/mysql-test/r/myisam_enable_keys-10506.result
new file mode 100644
index 00000000000..547f001fe34
--- /dev/null
+++ b/mysql-test/r/myisam_enable_keys-10506.result
@@ -0,0 +1,114 @@
+CREATE TABLE t1 (
+pk INT AUTO_INCREMENT,
+i INT,
+d DATE,
+dt DATETIME,
+v VARCHAR(1),
+PRIMARY KEY (pk),
+KEY (dt)
+) ENGINE=MyISAM;
+INSERT INTO t1 (i, d, dt, v) VALUES 
+(9, '2005-07-23', '2004-05-13 01:01:39', 't'),
+(2, '2009-11-01', '2003-12-24 07:39:29', 'h'),
+(6, NULL, '2008-07-03 05:32:22', 'l'),
+(6, '2007-07-16', '2008-08-28 18:46:11', 'j'),
+(5, NULL, '2001-07-12 21:27:00', 'h'),
+(3, '2007-07-22', '1900-01-01 00:00:00', 'p'),
+(2, '2000-11-21', '2007-05-25 11:58:54', 'g'),
+(6, '1900-01-01', '2009-06-03 17:11:10', 'i'),
+(2, '2008-02-10', '2001-06-15 16:20:07', 'p'),
+(3, '2009-06-04', '1900-01-01 00:00:00', 'h'),
+(9, '2007-04-25', '1900-01-01 00:00:00', 'e'),
+(9, '2006-03-02', '1900-01-01 00:00:00', 'e'),
+(1, '1900-01-01', '2002-11-08 09:33:27', 'u'),
+(7, '2008-07-13', '2007-08-07 17:35:52', 'j'),
+(0, '2004-11-12', '2006-05-01 00:00:00', 'e'),
+(0, '1900-01-01', '2003-05-01 00:00:00', 'z'),
+(1, '2009-09-02', '2007-02-12 09:30:49', 'w'),
+(0, '2004-11-06', '1900-01-01 00:00:00', 't'),
+(4, '2003-01-06', '2002-07-03 02:51:11', 'i'),
+(6, '2006-01-14', '2008-02-26 04:57:32', 'i'),
+(0, '2002-01-19', '2009-02-12 00:00:00', 'i'),
+(8, '2007-02-12', '1900-01-01 00:00:00', 'b'),
+(4, '1900-01-01', '2001-05-16 05:28:40', 'm'),
+(2, '2005-07-16', NULL, 'j'),
+(1, '2004-09-04', '2001-01-24 21:45:18', 'v'),
+(3, '2009-07-01', NULL, NULL),
+(2, '2009-07-21', '2002-07-24 00:00:00', 'h'),
+(4, NULL, '2001-11-03 12:22:30', 'q'),
+(1, '2002-06-22', '2008-06-17 03:17:59', 'f'),
+(7, '2005-06-23', '2005-12-24 00:00:00', 'p'),
+(6, '2001-05-20', '2008-10-23 00:00:00',  NULL),
+(3, '2001-10-01', '2000-10-12 16:32:35', 'o'),
+(3, '2001-01-07', '2005-09-11 10:09:54', 'w'),
+(6, '2007-11-02', '2009-09-10 01:44:18', 'l'),
+(6, NULL, NULL, 'i'),
+(9, NULL, '2002-05-18 15:21:55', 'd'),
+(4, '2008-12-21', '2004-10-15 10:09:54', 'j'),
+(6, '2003-10-05', '2009-07-13 03:51:02', 'e'),
+(2, '2001-03-03', '1900-01-01 00:00:00', 'e'),
+(2, '2007-04-04', '2001-11-08 21:14:52', 'q'),
+(5, NULL, '2006-12-02 00:00:00', 'm'),
+(0, '2009-01-04', '1900-01-01 00:00:00', NULL),
+(8, '2008-04-03', '2005-01-01 11:55:18', 'q'),
+(8, NULL, '2005-02-28 03:44:02', 'w'),
+(0, '2003-08-22', NULL, 'c'),
+(9, '1900-01-01', NULL, 'y'),
+(NULL, NULL, '2006-08-25 16:28:09', 'g'),
+(5, '2004-07-04', '2002-08-11 00:00:00', 'z'),
+(1, '1900-01-01', '2007-07-22 21:19:18', 'm'),
+(2, '2007-02-04', '2006-02-10 18:41:38', 't'),
+(2, '1900-01-01', '2009-02-16 14:58:58', 'd'),
+(7, '2001-03-14', '2007-08-14 00:00:00', 'h'),
+(0, NULL, '1900-01-01 00:00:00', NULL),
+(1, '2008-10-05', NULL, 'f'),
+(6, '2001-11-25', '2008-12-03 06:59:23', 'l'),
+(NULL, '2003-01-27', '2008-10-04 00:00:00', 'g'),
+(8, '2008-08-08', '2009-07-07 07:00:21', 'v'),
+(8, '2006-07-03', '2001-04-15 00:00:00', NULL),
+(5, '2002-11-21', '2007-07-08 04:01:58', 'm'),
+(5, '2006-04-08', '2007-09-23 00:01:35', 'i'),
+(5, '2001-05-06', '2008-05-15 00:00:00', 'h'),
+(7, '1900-01-01', '1900-01-01 00:00:00', 'u'),
+(30, '2007-04-16', '2004-03-05 23:35:38', 'o'),
+(NULL, '1900-01-01', '2007-08-25 01:32:47', 'z'),
+(6, '2004-12-03', '1900-01-01 00:00:00', 'o'),
+(8, '2001-06-23', '1900-01-01 00:00:00', 'f'),
+(NULL, '2008-12-15', '2001-05-19 08:28:28', 'a'),
+(9, '2000-02-15', '2009-09-03 06:07:22', 'd'),
+(2, '2001-08-05', '2006-10-08 07:17:27', 'k'),
+(5, '2004-01-17', '2003-09-06 20:36:01', 'd'),
+(4, '2003-10-01', '2001-02-05 18:10:49', 'u'),
+(4, '2003-07-28', '2001-01-07 16:11:37', 'h'),
+(0, '1900-01-01', '2008-08-01 05:26:38', 'w'),
+(9, '1900-01-01', '2001-05-08 00:00:00', 't'),
+(1, '2000-04-17', '2008-07-10 21:26:28', 'i'),
+(8, '2002-01-05', '2006-08-06 20:56:35', 'k'),
+(9, '2001-04-10', '2003-02-17 00:00:00', 'z'),
+(0, '2009-12-04', NULL, 'h'),
+(7, NULL, '2004-10-27 00:29:57', 'h'),
+(2, '2006-03-07', '2008-03-04 06:14:13', 'b'),
+(0, '2001-10-15', '2001-03-17 00:00:00', 'm'),
+(5, '1900-01-01', '2009-02-21 11:35:50', 'i'),
+(4, NULL, '1900-01-01 00:00:00', 'w'),
+(5, '2009-04-05', '1900-01-01 00:00:00', 'm'),
+(6, '2001-03-19', '2001-04-12 00:00:00', 'q'),
+(NULL, '2009-12-08', '2001-12-04 20:21:01', 'k'),
+(2, '2005-02-09', '2001-05-27 08:41:01', 'l'),
+(9, '2004-05-25', '2004-09-18 00:00:00', 'c'),
+(3, '2005-01-17', '2002-09-12 11:18:48', 'd'),
+(0, '2003-08-28', '1900-01-01 00:00:00', 'k'),
+(6, '2006-10-11', '2003-10-28 03:31:02', 'a'),
+(5, '1900-01-01', '2001-08-22 10:20:09', 'p'),
+(8, '1900-01-01', '2008-04-24 00:00:00', 'o'),
+(4, '2005-08-18', '2006-11-10 10:08:49', 'e'),
+(NULL, '2007-03-12', '2007-10-16 00:00:00', 'n'),
+(1, '2000-11-18', '2009-05-27 12:25:07', 't'),
+(4, '2001-03-03', NULL, 'u'),
+(3, '2003-09-11', '2001-09-10 18:10:10', 'f'),
+(4, '2007-06-17', '1900-01-01 00:00:00', 't'),
+(NULL, '2008-09-11', '2004-06-07 23:17:09', 'k');
+ALTER TABLE t1 ADD UNIQUE KEY ind1 (pk, d, i, v);
+ALTER TABLE t1 ADD UNIQUE KEY ind2 (d, v);
+ERROR 23000: Duplicate entry '1900-01-01-m' for key 'ind2'
+DROP TABLE t1;
-- 
cgit v1.2.1


From 1b3430a5ae6b2f6d5c251f1ff07f5c273b1dc175 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.org>
Date: Mon, 8 Aug 2016 16:04:40 +0400
Subject: MDEV-10500 CASE/IF Statement returns multiple values and shifts
 further result values to the next column

We assume all around the code that null_value==true is in sync
with NULL value returned by val_str()/val_decimal().
Item_sum_sum::val_decimal() erroneously returned a non-NULL value together
with null_value set to true. Fixing to return NULL instead.
---
 mysql-test/r/func_group.result | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index ac076ec4348..0253548236c 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -2270,3 +2270,30 @@ t2_id	GROUP_CONCAT(IF (t6.b, t6.f, t5.f) ORDER BY 1)
 EXECUTE stmt;
 t2_id	GROUP_CONCAT(IF (t6.b, t6.f, t5.f) ORDER BY 1)
 DROP TABLE t1,t2,t3,t4,t5,t6;
+#
+# MDEV-10500 CASE/IF Statement returns multiple values and shifts further result values to the next column
+#
+CREATE TABLE t1 (
+id int not null AUTO_INCREMENT,
+active bool not null,
+data1 bigint,
+data2 bigint,
+data3 bigint,
+primary key (id)
+);
+INSERT INTO t1 (active,data1,data2,data3) VALUES (1,null,100,200);
+SELECT
+CASE WHEN active THEN SUM(data1) END AS C_1,
+SUM(data2) AS C_2,
+SUM(data3) AS C_3
+FROM t1;
+C_1	C_2	C_3
+NULL	100	200
+SELECT
+IF(active, SUM(data1), 5) AS C_1,
+SUM(data2) AS C_2,
+SUM(data3) AS C_3
+FROM t1;
+C_1	C_2	C_3
+NULL	100	200
+DROP TABLE t1;
-- 
cgit v1.2.1


From 5269d378dfd576ecd03c82b3e763a98c83235636 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.org>
Date: Mon, 8 Aug 2016 18:37:02 +0400
Subject: MDEV-10468 Assertion `nr >= 0.0' failed in Item_sum_std::val_real()

---
 mysql-test/r/func_group.result | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index 0253548236c..38fae2f0a4f 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -2297,3 +2297,15 @@ FROM t1;
 C_1	C_2	C_3
 NULL	100	200
 DROP TABLE t1;
+#
+# MDEV-10468 Assertion `nr >= 0.0' failed in Item_sum_std::val_real()
+#
+SELECT STDDEV_POP(f) FROM (SELECT "1e+309" AS f UNION SELECT "-1e+309" AS f) tbl;
+STDDEV_POP(f)
+1.7976931348623157e308
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: '1e+309'
+Warning	1292	Truncated incorrect DOUBLE value: '-1e+309'
+SELECT STDDEV(f) FROM (SELECT 1.7976931348623157e+308 AS f UNION SELECT -1.7976931348623157e+308 AS f) tbl;
+STDDEV(f)
+1.7976931348623157e308
-- 
cgit v1.2.1


From a3f642415a8f8c52ed8a6b38ba5b48f814ab6bd8 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 8 Aug 2016 12:58:27 +0200
Subject: MDEV-6128:[PATCH] mysqlcheck wrongly escapes '.' in table names

a correct fix:
* store properly quoted table names in tables4repair/etc lists
* tell handle_request_for_tables whether the name is aalready properly quoted
* test cases for all uses of fix_table_name()
---
 mysql-test/r/mysqlcheck.result | 76 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 74 insertions(+), 2 deletions(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index d2f4745c5f1..56556fffb77 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -312,10 +312,37 @@ DROP TABLE bug47205;
 #
 #MDEV-6128:[PATCH] mysqlcheck wrongly escapes '.' in table names
 #
-CREATE TABLE test.`t.1` (id int);
+create table `t.1` (id int);
+create view `v.1` as select 1;
 mysqlcheck test t.1
 test.t.1                                           OK
-drop table test.`t.1`;
+mysqlcheck --all-in-1 test t.1
+test.t.1                                           OK
+mysqlcheck --all-in-1 --databases --process-views test
+test.t.1                                           OK
+test.v.1                                           OK
+create table `t.2`(a varchar(20) primary key) default character set utf8 collate utf8_general_ci engine=innodb;
+flush table `t.2`;
+mysqlcheck --check-upgrade --auto-repair test
+test.t.1                                           OK
+test.t.2
+error    : Table rebuild required. Please do "ALTER TABLE `t.2` FORCE" or dump/reload to fix it!
+test.t.3                                           Needs upgrade
+
+Repairing tables
+test.t.3                                           OK
+check table `t.1`, `t.2`, `t.3`;
+Table	Op	Msg_type	Msg_text
+test.t.1	check	status	OK
+test.t.2	check	status	OK
+test.t.3	check	status	OK
+check table `t.1`, `t.2`, `t.3` for upgrade;
+Table	Op	Msg_type	Msg_text
+test.t.1	check	status	OK
+test.t.2	check	status	OK
+test.t.3	check	status	OK
+drop view `v.1`;
+drop table test.`t.1`, `t.2`, `t.3`;
 create view v1 as select 1;
 mysqlcheck --process-views test
 test.v1                                            OK
@@ -344,3 +371,48 @@ show tables;
 Tables_in_test
 t1`1
 drop table `t1``1`;
+call mtr.add_suppression("ha_myisam");
+call mtr.add_suppression("Checking table");
+create database mysqltest1;
+create table mysqltest1.t1 (a int) engine=myisam;
+create table t2 (a int);
+check table mysqltest1.t1;
+Table	Op	Msg_type	Msg_text
+mysqltest1.t1	check	warning	Size of datafile is: 4       Should be: 0
+mysqltest1.t1	check	error	got error: 0 when reading datafile at record: 0
+mysqltest1.t1	check	error	Corrupt
+mtr.global_suppressions                            Table is already up to date
+mtr.test_suppressions                              Table is already up to date
+mysql.columns_priv                                 Table is already up to date
+mysql.db                                           Table is already up to date
+mysql.event                                        Table is already up to date
+mysql.func                                         Table is already up to date
+mysql.help_category                                Table is already up to date
+mysql.help_keyword                                 Table is already up to date
+mysql.help_relation                                Table is already up to date
+mysql.help_topic                                   Table is already up to date
+mysql.host                                         Table is already up to date
+mysql.ndb_binlog_index                             Table is already up to date
+mysql.plugin                                       Table is already up to date
+mysql.proc                                         Table is already up to date
+mysql.procs_priv                                   Table is already up to date
+mysql.proxies_priv                                 Table is already up to date
+mysql.servers                                      Table is already up to date
+mysql.tables_priv                                  Table is already up to date
+mysql.time_zone                                    Table is already up to date
+mysql.time_zone_leap_second                        Table is already up to date
+mysql.time_zone_name                               Table is already up to date
+mysql.time_zone_transition                         Table is already up to date
+mysql.time_zone_transition_type                    Table is already up to date
+mysql.user                                         Table is already up to date
+mysqltest1.t1
+warning  : Table is marked as crashed
+warning  : Size of datafile is: 4       Should be: 0
+error    : got error: 0 when reading datafile at record: 0
+error    : Corrupt
+test.t2                                            Table is already up to date
+
+Repairing tables
+mysqltest1.t1                                      OK
+drop table t2;
+drop database mysqltest1;
-- 
cgit v1.2.1


From 6f31dd093a245a21a69fd990f947611a5dcfb77b Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Sun, 21 Aug 2016 20:18:39 +0300
Subject: Added new status variables to make it easier to debug certain
 problems: - Handler_read_retry - Update_scan - Delete_scan

---
 mysql-test/r/create.result                      |   1 +
 mysql-test/r/derived_view.result                |  10 ++
 mysql-test/r/group_min_max.result               |   8 +
 mysql-test/r/handler_read_last.result           |   4 +
 mysql-test/r/innodb_ext_key.result              |  28 ++++
 mysql-test/r/insert_select.result               |   1 +
 mysql-test/r/join.result                        |   2 +
 mysql-test/r/join_outer.result                  |   3 +
 mysql-test/r/join_outer_jcl6.result             |   3 +
 mysql-test/r/limit_rows_examined.result         |   2 +
 mysql-test/r/null_key.result                    |   1 +
 mysql-test/r/order_by.result                    |   2 +
 mysql-test/r/partition.result                   |   6 +
 mysql-test/r/partition_explicit_prune.result    | 190 ++++++++++++------------
 mysql-test/r/ps.result                          |   4 +
 mysql-test/r/range_vs_index_merge.result        |   3 +
 mysql-test/r/range_vs_index_merge_innodb.result |   3 +
 mysql-test/r/select.result                      |   1 +
 mysql-test/r/select_jcl6.result                 |   1 +
 mysql-test/r/select_pkeycache.result            |   1 +
 mysql-test/r/single_delete_update.result        |  42 ++++++
 mysql-test/r/sp.result                          |   2 +
 mysql-test/r/status.result                      |   4 +-
 mysql-test/r/status_user.result                 |   1 +
 mysql-test/r/subselect.result                   |   2 +
 mysql-test/r/subselect3.result                  |   1 +
 mysql-test/r/subselect3_jcl6.result             |   1 +
 mysql-test/r/subselect_cache.result             |  30 ++++
 mysql-test/r/subselect_mat.result               |   1 +
 mysql-test/r/subselect_no_exists_to_in.result   |   2 +
 mysql-test/r/subselect_no_mat.result            |   2 +
 mysql-test/r/subselect_no_opts.result           |   2 +
 mysql-test/r/subselect_no_scache.result         |   2 +
 mysql-test/r/subselect_no_semijoin.result       |   2 +
 mysql-test/r/subselect_sj_mat.result            |   1 +
 mysql-test/r/update.result                      |  11 ++
 mysql-test/r/view.result                        |   2 +
 37 files changed, 286 insertions(+), 96 deletions(-)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 372e2baa02b..20120bf7663 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -1721,6 +1721,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	7
diff --git a/mysql-test/r/derived_view.result b/mysql-test/r/derived_view.result
index fa0a69a487d..a3b1e37a403 100644
--- a/mysql-test/r/derived_view.result
+++ b/mysql-test/r/derived_view.result
@@ -79,6 +79,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -93,6 +94,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	12
@@ -166,6 +168,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -180,6 +183,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	12
@@ -232,6 +236,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -248,6 +253,7 @@ Handler_read_key	11
 Handler_read_last	0
 Handler_read_next	3
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	11
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	36
@@ -323,6 +329,7 @@ Handler_read_key	22
 Handler_read_last	0
 Handler_read_next	22
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	60
@@ -340,6 +347,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -356,6 +364,7 @@ Handler_read_key	11
 Handler_read_last	0
 Handler_read_next	3
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	11
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	36
@@ -451,6 +460,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	8
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	39
diff --git a/mysql-test/r/group_min_max.result b/mysql-test/r/group_min_max.result
index 9421ea9e740..3fd87425e23 100644
--- a/mysql-test/r/group_min_max.result
+++ b/mysql-test/r/group_min_max.result
@@ -2378,6 +2378,7 @@ SHOW STATUS LIKE 'handler_read__e%';
 Variable_name	Value
 Handler_read_key	8
 Handler_read_next	0
+Handler_read_retry	0
 EXPLAIN SELECT max(b), a FROM t1 GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	NULL	a	5	NULL	8	Using index for group-by
@@ -2387,6 +2388,7 @@ SHOW STATUS LIKE 'handler_read__e%';
 Variable_name	Value
 Handler_read_key	8
 Handler_read_next	0
+Handler_read_retry	0
 FLUSH STATUS;
 SELECT * FROM (SELECT max(b), a FROM t1 GROUP BY a) b;
 max(b)	a
@@ -2398,6 +2400,7 @@ SHOW STATUS LIKE 'handler_read__e%';
 Variable_name	Value
 Handler_read_key	8
 Handler_read_next	0
+Handler_read_retry	0
 FLUSH STATUS;
 (SELECT max(b), a FROM t1 GROUP BY a) UNION 
 (SELECT max(b), a FROM t1 GROUP BY a);
@@ -2410,6 +2413,7 @@ SHOW STATUS LIKE 'handler_read__e%';
 Variable_name	Value
 Handler_read_key	16
 Handler_read_next	0
+Handler_read_retry	0
 EXPLAIN (SELECT max(b), a FROM t1 GROUP BY a) UNION 
 (SELECT max(b), a FROM t1 GROUP BY a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -2462,6 +2466,7 @@ SHOW STATUS LIKE 'handler_read__e%';
 Variable_name	Value
 Handler_read_key	8
 Handler_read_next	0
+Handler_read_retry	0
 DELETE FROM t3;
 FLUSH STATUS;
 INSERT INTO t3 SELECT 1, (SELECT MAX(b) FROM t1 GROUP BY a HAVING a < 2) 
@@ -2470,12 +2475,14 @@ SHOW STATUS LIKE 'handler_read__e%';
 Variable_name	Value
 Handler_read_key	8
 Handler_read_next	0
+Handler_read_retry	0
 FLUSH STATUS;
 DELETE FROM t3 WHERE (SELECT MAX(b) FROM t1 GROUP BY a HAVING a < 2) > 10000;
 SHOW STATUS LIKE 'handler_read__e%';
 Variable_name	Value
 Handler_read_key	8
 Handler_read_next	0
+Handler_read_retry	0
 FLUSH STATUS;
 DELETE FROM t3 WHERE (SELECT (SELECT MAX(b) FROM t1 GROUP BY a HAVING a < 2) x 
 FROM t1) > 10000;
@@ -2484,6 +2491,7 @@ SHOW STATUS LIKE 'handler_read__e%';
 Variable_name	Value
 Handler_read_key	8
 Handler_read_next	1
+Handler_read_retry	0
 DROP TABLE t1,t2,t3;
 CREATE TABLE t1 (a int, INDEX idx(a));
 INSERT INTO t1 VALUES
diff --git a/mysql-test/r/handler_read_last.result b/mysql-test/r/handler_read_last.result
index 574c3c25ab1..9dd3784673a 100644
--- a/mysql-test/r/handler_read_last.result
+++ b/mysql-test/r/handler_read_last.result
@@ -12,6 +12,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -26,6 +27,7 @@ Handler_read_key	0
 Handler_read_last	1
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -42,6 +44,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -58,6 +61,7 @@ Handler_read_key	0
 Handler_read_last	1
 Handler_read_next	0
 Handler_read_prev	2
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
diff --git a/mysql-test/r/innodb_ext_key.result b/mysql-test/r/innodb_ext_key.result
index 9140f306f77..2b3b98eb26a 100644
--- a/mysql-test/r/innodb_ext_key.result
+++ b/mysql-test/r/innodb_ext_key.result
@@ -20,6 +20,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	5
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -39,6 +40,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	1
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -60,6 +62,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -81,6 +84,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -102,6 +106,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	6
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -123,6 +128,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	1
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -146,6 +152,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	6
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -169,6 +176,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	3
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -188,6 +196,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	6
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -207,6 +216,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -228,6 +238,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	6
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -249,6 +260,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -270,6 +282,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	5
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -291,6 +304,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -317,6 +331,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	9
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	9
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -343,6 +358,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	2
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -370,6 +386,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	9
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	9
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -397,6 +414,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	3
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	3
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -422,6 +440,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	9
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	3
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -447,6 +466,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	3
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	3
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -477,6 +497,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	294
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -507,6 +528,7 @@ Handler_read_key	21
 Handler_read_last	1
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -529,6 +551,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	1230
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -551,6 +574,7 @@ Handler_read_key	6
 Handler_read_last	1
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -581,6 +605,7 @@ Handler_read_key	3
 Handler_read_last	0
 Handler_read_next	26
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -610,6 +635,7 @@ Handler_read_key	3
 Handler_read_last	0
 Handler_read_next	3
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -807,6 +833,7 @@ Handler_read_key	10
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	11
@@ -828,6 +855,7 @@ Handler_read_key	10
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	11
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
index 8bfc4e9215e..3f4a26a728e 100644
--- a/mysql-test/r/insert_select.result
+++ b/mysql-test/r/insert_select.result
@@ -701,6 +701,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	1
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index e7292e8ddce..d500b38a8dc 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -860,6 +860,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	5
@@ -1271,6 +1272,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	1
diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
index 40abc197a36..ac838997e41 100644
--- a/mysql-test/r/join_outer.result
+++ b/mysql-test/r/join_outer.result
@@ -1244,6 +1244,7 @@ Handler_read_key	5
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	6
@@ -1805,6 +1806,7 @@ Handler_read_key	4
 Handler_read_last	0
 Handler_read_next	5
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	1048581
@@ -1819,6 +1821,7 @@ Handler_read_key	4
 Handler_read_last	0
 Handler_read_next	5
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	1048581
diff --git a/mysql-test/r/join_outer_jcl6.result b/mysql-test/r/join_outer_jcl6.result
index 81395612269..38518c45eae 100644
--- a/mysql-test/r/join_outer_jcl6.result
+++ b/mysql-test/r/join_outer_jcl6.result
@@ -1255,6 +1255,7 @@ Handler_read_key	5
 Handler_read_last	0
 Handler_read_next	9
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	3
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	6
@@ -1816,6 +1817,7 @@ Handler_read_key	4
 Handler_read_last	0
 Handler_read_next	5
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	5
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	1048581
@@ -1830,6 +1832,7 @@ Handler_read_key	4
 Handler_read_last	0
 Handler_read_next	5
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	5
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	1048581
diff --git a/mysql-test/r/limit_rows_examined.result b/mysql-test/r/limit_rows_examined.result
index 130d17ae270..1f829d545f6 100644
--- a/mysql-test/r/limit_rows_examined.result
+++ b/mysql-test/r/limit_rows_examined.result
@@ -751,6 +751,7 @@ Handler_read_key	5
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	46
@@ -775,6 +776,7 @@ Handler_read_key	5
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	2
 Handler_read_rnd_deleted	1
 Handler_read_rnd_next	47
diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result
index e80851329a4..81bfa1ac994 100644
--- a/mysql-test/r/null_key.result
+++ b/mysql-test/r/null_key.result
@@ -429,6 +429,7 @@ Handler_read_key	6
 Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	5
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result
index 294142737d9..9c63570561d 100644
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/r/order_by.result
@@ -2862,6 +2862,7 @@ Handler_read_key	250
 Handler_read_last	0
 Handler_read_next	249
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	249
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	250
@@ -2880,6 +2881,7 @@ Handler_read_key	250
 Handler_read_last	0
 Handler_read_next	249
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	250
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index 233494238a5..09b22761bcb 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -562,6 +562,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -582,6 +583,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -614,6 +616,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -632,6 +635,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -650,6 +654,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -668,6 +673,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
diff --git a/mysql-test/r/partition_explicit_prune.result b/mysql-test/r/partition_explicit_prune.result
index 765803d6332..3ca1e688e8f 100644
--- a/mysql-test/r/partition_explicit_prune.result
+++ b/mysql-test/r/partition_explicit_prune.result
@@ -19,7 +19,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_RND_NEXT	3
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 4 locks (1 table, 1 partition lock/unlock)
 FLUSH STATUS;
 SELECT a FROM t1 PARTITION (p0);
@@ -31,7 +31,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_RND_NEXT	3
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 4 locks (1 table, 1 partition lock/unlock)
 FLUSH STATUS;
 INSERT INTO v1 VALUES (10);
@@ -39,14 +39,14 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	2
 # 4 locks (1 table, 1 partition lock/unlock)
 FLUSH STATUS;
 SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 2 locks (1 table, all partitions pruned)
 FLUSH STATUS;
 SELECT * FROM v1;
@@ -59,7 +59,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_RND_NEXT	4
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 4 locks (1 table, 1 partition lock/unlock)
 FLUSH STATUS;
 SELECT a FROM t1 PARTITION (p0);
@@ -72,7 +72,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_RND_NEXT	4
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 4 locks (1 table, 1 partition lock/unlock)
 SELECT * FROM t1;
 a
@@ -89,14 +89,14 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	2
 # 4 locks (1 table, 1 partition lock/unlock)
 FLUSH STATUS;
 SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 2 locks (1 table, all partitions pruned)
 SELECT * FROM v1;
 a
@@ -121,7 +121,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	2
 # 4 locks (1 table, 1 partition lock/unlock)
 FLUSH STATUS;
@@ -131,7 +131,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 2 locks (1 table, all partitions pruned)
 FLUSH STATUS;
 INSERT INTO v1 VALUES (32);
@@ -140,7 +140,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 4 locks (1 table, 1 partition lock/unlock)
 SELECT * FROM v1;
 a
@@ -166,12 +166,12 @@ FLUSH STATUS;
 SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
-HANDLER_READ_RND_NEXT	26
-HANDLER_TMP_WRITE	47
+HANDLER_READ_RND_NEXT	27
+HANDLER_TMP_WRITE	49
 # OK, seems to add number of variables processed before HANDLER_WRITE
 # and number of variables + 1 evaluated in the previous call in RND_NEXT
 CREATE TABLE t1
@@ -233,7 +233,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	2
 # Should be 1 commit
 # 4 external locks (due to pruning of locks)
@@ -250,7 +250,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	2
 # Should be 1 commit
 # 4 external locks
@@ -262,7 +262,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # should be 1 commit
 # 9 locks (1 ha_partition + 8 ha_innobase)
 # 17 writes (internal I_S)
@@ -271,8 +271,8 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
-HANDLER_READ_RND_NEXT	26
-HANDLER_TMP_WRITE	47
+HANDLER_READ_RND_NEXT	27
+HANDLER_TMP_WRITE	49
 HANDLER_WRITE	2
 # + 1 commit
 # + 19 rnd next (internal I_S)
@@ -282,8 +282,8 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
-HANDLER_READ_RND_NEXT	52
-HANDLER_TMP_WRITE	72
+HANDLER_READ_RND_NEXT	54
+HANDLER_TMP_WRITE	75
 HANDLER_WRITE	2
 # + 9 locks (unlocks)
 # + 19 rnd next (internal I_S)
@@ -338,7 +338,7 @@ ERROR HY000: Unknown partition 'pNonexistent' in table 't1'
 SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # should have failed before locking (only 17 internal I_S writes)
 FLUSH STATUS;
 SELECT * FROM t1 PARTITION (subp2);
@@ -348,7 +348,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_FIRST	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # Should be 1 commit
 # 4 locks (1 ha_partition + 1 ha_innobase) x 2 (lock/unlock)
 # 1 read first (also calls index_read)
@@ -366,7 +366,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_FIRST	3
 HANDLER_READ_NEXT	3
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # Should be 1 commit
 # 8 locks (1 ha_partition + 2 + 1 ha_innobase) x 2
 # 3 read first (one for each partition)
@@ -379,7 +379,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 1 commit
 # 18 locks
 # 18 READ KEY from opening a new partition table instance,
@@ -398,8 +398,8 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
 HANDLER_READ_FIRST	1
 HANDLER_READ_NEXT	3
-HANDLER_READ_RND_NEXT	26
-HANDLER_TMP_WRITE	47
+HANDLER_READ_RND_NEXT	27
+HANDLER_TMP_WRITE	49
 # + 1 commit
 # + 1 read first (read first key from index in one partition)
 # + 2 read key (innobase_get_index from index_init + from index_first)
@@ -415,8 +415,8 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	3
 HANDLER_READ_FIRST	3
 HANDLER_READ_NEXT	4
-HANDLER_READ_RND_NEXT	52
-HANDLER_TMP_WRITE	72
+HANDLER_READ_RND_NEXT	54
+HANDLER_TMP_WRITE	75
 # + 1 commit
 # + 2 read first (one for each subpart)
 # + 4 read key (innobase_get_index from index_init + from index_first)
@@ -431,8 +431,8 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	4
 HANDLER_READ_FIRST	3
 HANDLER_READ_NEXT	4
-HANDLER_READ_RND_NEXT	78
-HANDLER_TMP_WRITE	97
+HANDLER_READ_RND_NEXT	81
+HANDLER_TMP_WRITE	101
 # No matching partition, only internal I_S.
 SELECT * FROM t1 PARTITION (pNeg) WHERE a = 100;
 a	b
@@ -443,8 +443,8 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	5
 HANDLER_READ_FIRST	3
 HANDLER_READ_NEXT	4
-HANDLER_READ_RND_NEXT	104
-HANDLER_TMP_WRITE	122
+HANDLER_READ_RND_NEXT	108
+HANDLER_TMP_WRITE	127
 # + 18 for unlock (same as lock above) (100 is not in pNeg, no match)
 # Test that EXPLAIN PARTITION works
 EXPLAIN PARTITIONS SELECT * FROM t1 PARTITION (pNonexistent);
@@ -460,7 +460,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 8 locks (1 ha_partition + 3 ha_innobase) x 2 (lock/unlock)
 EXPLAIN PARTITIONS SELECT * FROM t1 PARTITION (subp3) AS TableAlias;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
@@ -513,7 +513,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	1
 # 2 locks (1 ha_partition) x 2 (lock/unlock), Was 4 locks before WL4443
 # explicit pruning says part_id 0 and implicit pruning says part_id 1
@@ -526,7 +526,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	2
 # 1 commit
 # 4 locks (1 ha_partition + 1 ha_innobase) x 2 (lock/unlock)
@@ -544,7 +544,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_KEY	2
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_UPDATE	2
 HANDLER_WRITE	2
 # 1 commit
@@ -566,7 +566,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 1 commit
 # 9 locks
 # 17 write (internal I_S)
@@ -578,8 +578,8 @@ HANDLER_COMMIT	2
 HANDLER_DELETE	2
 HANDLER_READ_KEY	1
 HANDLER_READ_NEXT	1
-HANDLER_READ_RND_NEXT	26
-HANDLER_TMP_WRITE	47
+HANDLER_READ_RND_NEXT	27
+HANDLER_TMP_WRITE	49
 # + 1 commit
 # + 1 delete (one row deleted)
 # + 3 read key (1 innodb_get_index in records_in_range,
@@ -596,9 +596,9 @@ HANDLER_COMMIT	2
 HANDLER_DELETE	2
 HANDLER_READ_KEY	1
 HANDLER_READ_NEXT	1
-HANDLER_READ_RND_NEXT	52
+HANDLER_READ_RND_NEXT	54
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	72
+HANDLER_TMP_WRITE	75
 HANDLER_WRITE	1
 # Failed before start_stmt/execution.
 # + 19 rnd next (internal I_S)
@@ -612,9 +612,9 @@ HANDLER_COMMIT	3
 HANDLER_DELETE	2
 HANDLER_READ_KEY	1
 HANDLER_READ_NEXT	1
-HANDLER_READ_RND_NEXT	78
+HANDLER_READ_RND_NEXT	81
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	97
+HANDLER_TMP_WRITE	101
 HANDLER_WRITE	3
 # + 1 commit
 # + 19 rnd next (internal I_S)
@@ -627,9 +627,9 @@ HANDLER_COMMIT	4
 HANDLER_DELETE	2
 HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
-HANDLER_READ_RND_NEXT	104
+HANDLER_READ_RND_NEXT	108
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	122
+HANDLER_TMP_WRITE	127
 HANDLER_UPDATE	2
 HANDLER_WRITE	5
 # + 1 commit
@@ -650,9 +650,9 @@ HANDLER_DELETE	2
 HANDLER_READ_FIRST	1
 HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	4
-HANDLER_READ_RND_NEXT	130
+HANDLER_READ_RND_NEXT	135
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	147
+HANDLER_TMP_WRITE	153
 HANDLER_UPDATE	2
 HANDLER_WRITE	5
 # + 1 commit
@@ -670,9 +670,9 @@ HANDLER_DELETE	2
 HANDLER_READ_FIRST	1
 HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	4
-HANDLER_READ_RND_NEXT	156
+HANDLER_READ_RND_NEXT	162
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	172
+HANDLER_TMP_WRITE	179
 HANDLER_UPDATE	2
 HANDLER_WRITE	5
 # + 9 locks
@@ -696,7 +696,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_FIRST	4
 HANDLER_READ_NEXT	5
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 1 commit
 # 10 locks (1 ha_partition + 4 ha_innobase) x 2 (lock/unlock)
 # 4 read first (for reading the first row in 4 partitions)
@@ -709,7 +709,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 10 locks (table + 4 partition) x (lock + unlock)
 SELECT * FROM t1 PARTITION (pNeg, `p10-99`);
 a	b
@@ -720,7 +720,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	3
 # 6 locks (1 ha_partition + 2 ha_innobase) x 2 (lock+unlock)
 # 1 rollback
@@ -732,7 +732,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	10
 # 10 lock (1 ha_partition + 4 ha_innobase) x 2 (lock + unlock)
 ALTER TABLE t1 TRUNCATE PARTITION pNeg, `p10-99`;
@@ -742,7 +742,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 9 locks
 # 18 read key (ALTER forces table to be closed, see above for open)
 LOAD DATA INFILE 'loadtest.txt' INTO TABLE t1 PARTITION (pNeg, `p10-99`);
@@ -750,8 +750,8 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
-HANDLER_READ_RND_NEXT	26
-HANDLER_TMP_WRITE	47
+HANDLER_READ_RND_NEXT	27
+HANDLER_TMP_WRITE	49
 HANDLER_WRITE	10
 # + 23 write (18 internal I_S + 5 rows)
 UNLOCK TABLES;
@@ -759,8 +759,8 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
-HANDLER_READ_RND_NEXT	52
-HANDLER_TMP_WRITE	72
+HANDLER_READ_RND_NEXT	54
+HANDLER_TMP_WRITE	75
 HANDLER_WRITE	10
 # + 9 locks
 #
@@ -773,7 +773,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_RND_NEXT	2
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_UPDATE	2
 # 1 commit
 # 4 lock (1 ha_partition + 1 ha_innobase) x 2 (lock + unlock)
@@ -791,7 +791,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_KEY	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_UPDATE	2
 # 1 commit
 # 4 lock
@@ -806,7 +806,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_KEY	1
 HANDLER_READ_RND	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_UPDATE	2
 # 1 commit
 # 4 lock
@@ -819,7 +819,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # Nothing, since impossible PARTITION+WHERE clause.
 FLUSH STATUS;
 UPDATE t1 PARTITION(subp0) SET a = -2, b = concat(b, ', Updated from a = 100')
@@ -828,7 +828,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # Nothing, since impossible PARTITION+WHERE clause.
 FLUSH STATUS;
 UPDATE t1 PARTITION(`p100-99999`) SET a = -2, b = concat(b, ', Updated from a = 100')
@@ -840,7 +840,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_READ_KEY	1
 HANDLER_READ_RND	1
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_UPDATE	1
 # 6 lock
 # 4 read key (1 index init + 1 index read + 1 rnd init + 1 rnd pos)
@@ -856,7 +856,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_READ_KEY	1
 HANDLER_READ_RND	1
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_UPDATE	1
 HANDLER_WRITE	1
 # 10 locks
@@ -874,7 +874,7 @@ HANDLER_COMMIT	1
 HANDLER_DELETE	1
 HANDLER_READ_KEY	1
 HANDLER_READ_RND	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_UPDATE	1
 HANDLER_WRITE	1
 # 1 commit
@@ -902,7 +902,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # Nothing (no matching partition found)
 FLUSH STATUS;
 UPDATE t1 PARTITION (pNeg) SET b = concat(b, ', Updated2') WHERE a = 1000000;
@@ -910,7 +910,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # Nothing (no matching partition found)
 FLUSH STATUS;
 LOCK TABLE t1 WRITE;
@@ -918,7 +918,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 9 locks
 UPDATE t1 PARTITION (subp7) SET b = concat(b, ', Updated to 103'), a = 103 WHERE a = 101;
 SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
@@ -927,8 +927,8 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
 HANDLER_READ_KEY	1
 HANDLER_READ_RND	1
-HANDLER_READ_RND_NEXT	26
-HANDLER_TMP_WRITE	47
+HANDLER_READ_RND_NEXT	27
+HANDLER_TMP_WRITE	49
 HANDLER_UPDATE	2
 # + 4 read key
 # + 1 read rnd
@@ -941,8 +941,8 @@ HANDLER_COMMIT	3
 HANDLER_DELETE	1
 HANDLER_READ_KEY	2
 HANDLER_READ_RND	2
-HANDLER_READ_RND_NEXT	52
-HANDLER_TMP_WRITE	72
+HANDLER_READ_RND_NEXT	54
+HANDLER_TMP_WRITE	75
 HANDLER_UPDATE	3
 HANDLER_WRITE	1
 # + 1 delete
@@ -957,8 +957,8 @@ HANDLER_COMMIT	3
 HANDLER_DELETE	1
 HANDLER_READ_KEY	2
 HANDLER_READ_RND	2
-HANDLER_READ_RND_NEXT	78
-HANDLER_TMP_WRITE	97
+HANDLER_READ_RND_NEXT	81
+HANDLER_TMP_WRITE	101
 HANDLER_UPDATE	3
 HANDLER_WRITE	1
 + 9 locks
@@ -986,7 +986,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_DELETE	2
 HANDLER_READ_KEY	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 1 delete
 # 4 locks (pruning works!).
 # 1 read key (index read)
@@ -998,7 +998,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_DELETE	2
 HANDLER_READ_RND_NEXT	3
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 1 delete
 # 4 locks
 # 1 read first
@@ -1010,7 +1010,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 9 locks
 DELETE FROM t1 PARTITION (subp1) WHERE b = 'p0-9:subp3';
 SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
@@ -1018,8 +1018,8 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	2
 HANDLER_READ_KEY	1
-HANDLER_READ_RND_NEXT	26
-HANDLER_TMP_WRITE	47
+HANDLER_READ_RND_NEXT	27
+HANDLER_TMP_WRITE	49
 # + 3 read key (1 innodb_get_index in records_in_range
 #               + 1 innobase_get_index in index_init + 1 index read)
 DELETE FROM t1 PARTITION (`p0-9`) WHERE b = 'p0-9:subp3';
@@ -1030,8 +1030,8 @@ HANDLER_COMMIT	3
 HANDLER_DELETE	2
 HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
-HANDLER_READ_RND_NEXT	52
-HANDLER_TMP_WRITE	72
+HANDLER_READ_RND_NEXT	54
+HANDLER_TMP_WRITE	75
 # + 1 delete
 # + 6 read key (same as above, but for two subpartitions)
 # + 1 read next (read next after found row)
@@ -1043,8 +1043,8 @@ HANDLER_COMMIT	3
 HANDLER_DELETE	2
 HANDLER_READ_KEY	3
 HANDLER_READ_NEXT	1
-HANDLER_READ_RND_NEXT	78
-HANDLER_TMP_WRITE	97
+HANDLER_READ_RND_NEXT	81
+HANDLER_TMP_WRITE	101
 # + 9 locks
 # Test multi-table DELETE
 # Can be expressed in two different ways.
@@ -1057,7 +1057,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_FIRST	5
 HANDLER_READ_NEXT	5
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	10
 # 24 locks (2 table, 5 + 5 subpartitions lock/unlock)
 FLUSH STATUS;
@@ -1066,7 +1066,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 14 locks (1 table, 6 subpartitions lock/unlock)
 FLUSH STATUS;
 INSERT INTO t2 PARTITION (subp3) SELECT * FROM t1 PARTITION (subp3, `p10-99`, `p100-99999`);
@@ -1076,7 +1076,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_READ_FIRST	5
 HANDLER_ROLLBACK	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	1
 # 16 locks (2 tables, 1 + 5 subpartitions lock/unlock)
 FLUSH STATUS;
@@ -1091,7 +1091,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_FIRST	5
 HANDLER_READ_NEXT	5
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	7
 # 16 locks (2 tables, 1 + 5 subpartitions lock/unlock)
 TRUNCATE TABLE t2;
@@ -1103,7 +1103,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_FIRST	5
 HANDLER_READ_NEXT	5
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	10
 # 30 locks (2 table, 8 + 5 subpartitions lock/unlock)
 FLUSH STATUS;
@@ -1114,7 +1114,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_FIRST	5
 HANDLER_READ_NEXT	7
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 HANDLER_WRITE	7
 # 14 locks (2 table, 5 subpartitions lock/unlock)
 SHOW CREATE TABLE t1;
@@ -1201,7 +1201,7 @@ WHERE t1.a = t3.a AND t3.b = 'subp3'' at line 1
 SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # Multi table delete without any matching rows
 FLUSH STATUS;
 DELETE t1, t2 FROM t1 PARTITION (pNeg), t3, t2 PARTITION (subp3)
@@ -1211,7 +1211,7 @@ WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
 HANDLER_READ_RND_NEXT	3
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 12 locks (3 in t1, 1 in t3, 2 in t2) x 2 (lock + unlock)
 # 1 read first (first rnd_next in t2)
 # 4 read key (1 innodb_get_index in rnd_init in t2 + index read in t2
@@ -1231,7 +1231,7 @@ HANDLER_READ_KEY	2
 HANDLER_READ_NEXT	2
 HANDLER_READ_RND	4
 HANDLER_READ_RND_NEXT	16
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 4 delete (2 in t2 + 2 in t3)
 # 12 locks (3 in t2, 1 in t3, 2 in t1) x 2 (lock + unlock)
 # 3 read first (1 in t1 + 1 in t3 + 1 in t3, for second row in t1)
@@ -1279,7 +1279,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_STATUS
 WHERE VARIABLE_NAME LIKE 'HANDLER_%' AND VARIABLE_VALUE > 0;
 VARIABLE_NAME	VARIABLE_VALUE
 HANDLER_COMMIT	1
-HANDLER_TMP_WRITE	22
+HANDLER_TMP_WRITE	23
 # 6 locks (lock/unlock two subpartitions + table)
 # Test on non partitioned table
 SELECT * FROM t3 PARTITION (pNeg);
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 8d073f8da1e..517e2d23915 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -3949,6 +3949,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -3963,6 +3964,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -3977,6 +3979,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	8
@@ -3991,6 +3994,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
diff --git a/mysql-test/r/range_vs_index_merge.result b/mysql-test/r/range_vs_index_merge.result
index 1b12a9f5512..9af359a55f3 100644
--- a/mysql-test/r/range_vs_index_merge.result
+++ b/mysql-test/r/range_vs_index_merge.result
@@ -1310,6 +1310,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	385
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	377
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -1338,6 +1339,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	59
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -1367,6 +1369,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	59
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
diff --git a/mysql-test/r/range_vs_index_merge_innodb.result b/mysql-test/r/range_vs_index_merge_innodb.result
index 8428936d25f..601ae9b7613 100644
--- a/mysql-test/r/range_vs_index_merge_innodb.result
+++ b/mysql-test/r/range_vs_index_merge_innodb.result
@@ -1311,6 +1311,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	385
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	377
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -1339,6 +1340,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	59
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -1368,6 +1370,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	59
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 7219a9c4462..8d5ee08e44e 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -4351,6 +4351,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	6
diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result
index 3c62d0676ae..db7f2c473a8 100644
--- a/mysql-test/r/select_jcl6.result
+++ b/mysql-test/r/select_jcl6.result
@@ -4362,6 +4362,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	10
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	10
 Handler_read_rnd_deleted	1
 Handler_read_rnd_next	6
diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/r/select_pkeycache.result
index 7219a9c4462..8d5ee08e44e 100644
--- a/mysql-test/r/select_pkeycache.result
+++ b/mysql-test/r/select_pkeycache.result
@@ -4351,6 +4351,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	6
diff --git a/mysql-test/r/single_delete_update.result b/mysql-test/r/single_delete_update.result
index 9332effeb56..84380216b74 100644
--- a/mysql-test/r/single_delete_update.result
+++ b/mysql-test/r/single_delete_update.result
@@ -29,6 +29,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -48,6 +49,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -84,6 +86,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -103,6 +106,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	5
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -136,6 +140,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -155,6 +160,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -192,6 +198,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -211,6 +218,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -242,6 +250,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -261,6 +270,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -290,6 +300,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -309,6 +320,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -341,6 +353,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	7
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	4
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -365,6 +378,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	7
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	8
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -403,6 +417,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	4
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -422,6 +437,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	4
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -458,6 +474,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -477,6 +494,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	5
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -522,6 +540,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -547,6 +566,7 @@ Handler_read_key	0
 Handler_read_last	1
 Handler_read_next	0
 Handler_read_prev	4
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -566,6 +586,7 @@ Handler_read_key	0
 Handler_read_last	1
 Handler_read_next	0
 Handler_read_prev	4
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -603,6 +624,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -622,6 +644,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	5
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -663,6 +686,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -682,6 +706,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	5
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -720,6 +745,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -739,6 +765,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -776,6 +803,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -795,6 +823,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	5
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -826,6 +855,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -845,6 +875,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -875,6 +906,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -894,6 +926,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -927,6 +960,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	7
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	4
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -951,6 +985,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	7
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	8
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -993,6 +1028,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	4
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -1012,6 +1048,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	4
+Handler_read_retry	0
 Handler_read_rnd	5
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -1053,6 +1090,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -1072,6 +1110,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	5
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -1111,6 +1150,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	4
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -1136,6 +1176,7 @@ Handler_read_key	0
 Handler_read_last	1
 Handler_read_next	0
 Handler_read_prev	4
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -1155,6 +1196,7 @@ Handler_read_key	0
 Handler_read_last	1
 Handler_read_next	0
 Handler_read_prev	4
+Handler_read_retry	0
 Handler_read_rnd	5
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 471576e563f..45cd071e732 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -7713,6 +7713,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -7724,6 +7725,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	4097
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result
index 140db7c5721..600a4fbd59f 100644
--- a/mysql-test/r/status.result
+++ b/mysql-test/r/status.result
@@ -287,6 +287,7 @@ Handler_read_key	4
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	7
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	23
@@ -304,7 +305,7 @@ Created_tmp_files	0
 Created_tmp_tables	2
 Handler_tmp_update	2
 Handler_tmp_write	7
-Rows_tmp_read	42
+Rows_tmp_read	43
 drop table t1;
 CREATE TABLE t1 (i int(11) DEFAULT NULL, KEY i (i) ) ENGINE=MyISAM;
 insert into t1 values (1),(2),(3),(4),(5);
@@ -329,6 +330,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	2
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	1
 Handler_read_rnd_next	2
diff --git a/mysql-test/r/status_user.result b/mysql-test/r/status_user.result
index c6248a85d3a..d00a7d3047f 100644
--- a/mysql-test/r/status_user.result
+++ b/mysql-test/r/status_user.result
@@ -112,6 +112,7 @@ Handler_read_key	9
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	5
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index fa6a0624dcb..a58d35708fe 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -6868,6 +6868,7 @@ Handler_read_key	8
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	22
@@ -6905,6 +6906,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	16
diff --git a/mysql-test/r/subselect3.result b/mysql-test/r/subselect3.result
index 24d9f0de35a..0c03959a96a 100644
--- a/mysql-test/r/subselect3.result
+++ b/mysql-test/r/subselect3.result
@@ -124,6 +124,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	41
diff --git a/mysql-test/r/subselect3_jcl6.result b/mysql-test/r/subselect3_jcl6.result
index 19d3d25148f..415963af882 100644
--- a/mysql-test/r/subselect3_jcl6.result
+++ b/mysql-test/r/subselect3_jcl6.result
@@ -134,6 +134,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	41
diff --git a/mysql-test/r/subselect_cache.result b/mysql-test/r/subselect_cache.result
index e5a2fe12526..03d683de0d8 100644
--- a/mysql-test/r/subselect_cache.result
+++ b/mysql-test/r/subselect_cache.result
@@ -36,6 +36,7 @@ Handler_read_key	7
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	31
@@ -64,6 +65,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	61
@@ -91,6 +93,7 @@ Handler_read_key	7
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	31
@@ -117,6 +120,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	61
@@ -144,6 +148,7 @@ Handler_read_key	7
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	31
@@ -170,6 +175,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	61
@@ -269,6 +275,7 @@ Handler_read_key	7
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	442
@@ -367,6 +374,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	472
@@ -390,6 +398,7 @@ Handler_read_key	17
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	4
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	36
@@ -412,6 +421,7 @@ Handler_read_key	10
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	4
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	86
@@ -435,6 +445,7 @@ Handler_read_key	17
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	4
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	41
@@ -457,6 +468,7 @@ Handler_read_key	10
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	4
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	91
@@ -486,6 +498,7 @@ Handler_read_key	7
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	31
@@ -514,6 +527,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	61
@@ -537,6 +551,7 @@ Handler_read_key	7
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	4
 Handler_read_rnd_deleted	1
 Handler_read_rnd_next	36
@@ -559,6 +574,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	4
 Handler_read_rnd_deleted	1
 Handler_read_rnd_next	66
@@ -658,6 +674,7 @@ Handler_read_key	70
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	141
@@ -756,6 +773,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	671
@@ -1381,6 +1399,7 @@ Handler_read_key	11
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	145
@@ -1411,6 +1430,7 @@ Handler_read_key	32
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	84
@@ -1444,6 +1464,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	127
@@ -1474,6 +1495,7 @@ Handler_read_key	13
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	69
@@ -1665,6 +1687,7 @@ Handler_read_key	15
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	8
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	57
@@ -1691,6 +1714,7 @@ Handler_read_key	21
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	8
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	37
@@ -1718,6 +1742,7 @@ Handler_read_key	15
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	8
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	57
@@ -1744,6 +1769,7 @@ Handler_read_key	22
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	8
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	41
@@ -1786,6 +1812,7 @@ Handler_read_key	15
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	16
@@ -1824,6 +1851,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	151
@@ -1861,6 +1889,7 @@ Handler_read_key	15
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	43
@@ -1898,6 +1927,7 @@ Handler_read_key	18
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	27
diff --git a/mysql-test/r/subselect_mat.result b/mysql-test/r/subselect_mat.result
index 5f3495aae6f..1ea71b6ee32 100644
--- a/mysql-test/r/subselect_mat.result
+++ b/mysql-test/r/subselect_mat.result
@@ -2209,6 +2209,7 @@ Handler_read_key	5000
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	6003
diff --git a/mysql-test/r/subselect_no_exists_to_in.result b/mysql-test/r/subselect_no_exists_to_in.result
index 012d7a80610..8b2d12c50f6 100644
--- a/mysql-test/r/subselect_no_exists_to_in.result
+++ b/mysql-test/r/subselect_no_exists_to_in.result
@@ -6868,6 +6868,7 @@ Handler_read_key	8
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	22
@@ -6905,6 +6906,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	16
diff --git a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result
index e83697fcb4f..6051a58c3be 100644
--- a/mysql-test/r/subselect_no_mat.result
+++ b/mysql-test/r/subselect_no_mat.result
@@ -6862,6 +6862,7 @@ Handler_read_key	8
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	22
@@ -6899,6 +6900,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	16
diff --git a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
index c620f788cf7..718cf8b6099 100644
--- a/mysql-test/r/subselect_no_opts.result
+++ b/mysql-test/r/subselect_no_opts.result
@@ -6859,6 +6859,7 @@ Handler_read_key	8
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	22
@@ -6896,6 +6897,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	16
diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result
index b2b2518bdd3..2b84f569fc5 100644
--- a/mysql-test/r/subselect_no_scache.result
+++ b/mysql-test/r/subselect_no_scache.result
@@ -6874,6 +6874,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	58
@@ -6911,6 +6912,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	16
diff --git a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result
index 2bd82dffd36..a2841793f15 100644
--- a/mysql-test/r/subselect_no_semijoin.result
+++ b/mysql-test/r/subselect_no_semijoin.result
@@ -6859,6 +6859,7 @@ Handler_read_key	8
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	22
@@ -6896,6 +6897,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	16
diff --git a/mysql-test/r/subselect_sj_mat.result b/mysql-test/r/subselect_sj_mat.result
index 34d5834bff4..fee63d8204e 100644
--- a/mysql-test/r/subselect_sj_mat.result
+++ b/mysql-test/r/subselect_sj_mat.result
@@ -2249,6 +2249,7 @@ Handler_read_key	5000
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	6003
diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result
index a0c35c6e0ca..49141e33709 100644
--- a/mysql-test/r/update.result
+++ b/mysql-test/r/update.result
@@ -276,6 +276,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -289,6 +290,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	2
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	9
@@ -301,6 +303,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -313,6 +316,7 @@ Handler_read_key	0
 Handler_read_last	1
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -326,6 +330,7 @@ Handler_read_key	0
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	2
 Handler_read_rnd_next	7
@@ -381,6 +386,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	1
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	1
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -420,6 +426,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -432,6 +439,7 @@ Handler_read_key	2
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -443,6 +451,7 @@ Handler_read_key	3
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -454,6 +463,7 @@ Handler_read_key	3
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
@@ -699,6 +709,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	1
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	2
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	0
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index a92ccbdde94..52c379d03af 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -4255,6 +4255,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
@@ -4278,6 +4279,7 @@ Handler_read_key	1
 Handler_read_last	0
 Handler_read_next	0
 Handler_read_prev	0
+Handler_read_retry	0
 Handler_read_rnd	0
 Handler_read_rnd_deleted	0
 Handler_read_rnd_next	17
-- 
cgit v1.2.1


From dfa3046db48d8439cf3eb02ba6623fe2f6e44f91 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 25 Aug 2016 15:11:21 +0200
Subject: fix a test for windows

---
 mysql-test/r/named_pipe.result | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/named_pipe.result b/mysql-test/r/named_pipe.result
index ddd48f0ba91..43fb44beece 100644
--- a/mysql-test/r/named_pipe.result
+++ b/mysql-test/r/named_pipe.result
@@ -2154,3 +2154,4 @@ Privat (Private Nutzung)	Mobilfunk
 Warnings:
 Warning	1052	Column 'kundentyp' in group statement is ambiguous
 drop table t1;
+FOUND /\[ERROR\] Create named pipe failed/ in second-mysqld.err
-- 
cgit v1.2.1


From a02642b66e06f95b80fa9ee592ba50eb61dc2f17 Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Thu, 23 Jun 2016 17:50:07 +0200
Subject: MDEV-10017: Get unexpected `Empty Set` for correlated subquery with
 aggregate functions (part 1)

Make aggregate function dependency visible.
---
 mysql-test/r/func_group.result       | 18 ++++++++++++++++++
 mysql-test/r/subselect3.result       |  1 +
 mysql-test/r/subselect3_jcl6.result  |  1 +
 mysql-test/r/subselect_mat.result    |  1 +
 mysql-test/r/subselect_sj_mat.result |  1 +
 5 files changed, 22 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index 318248459a5..dc3a0b60ad3 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -2379,5 +2379,23 @@ companynr	AVG(fld1)	avg1	avg2
 37	9223372036854775805.0000	9223372036854775805	9223372036854775805
 DROP TABLE t1;
 #
+# case where aggregate resolved in the local SELECT
+# but outer ones are checked
+#
+create table t10 (a int , b int, c int);
+insert into t10 values (0,0,0),(1,1,1);
+create table t11 as select * from t10;
+create table t12 as select * from t10;
+explain extended select a from t10 where c<3 or a in (select c from t12 union select max(t10.b) from t11 group by t11.c);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	t10	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+2	DEPENDENT SUBQUERY	t12	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+3	DEPENDENT UNION	t11	ALL	NULL	NULL	NULL	NULL	2	100.00	Using temporary
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+Warnings:
+Note	1276	Field or reference 'test.t10.b' of SELECT #3 was resolved in SELECT #1
+Note	1003	select `test`.`t10`.`a` AS `a` from `test`.`t10` where ((`test`.`t10`.`c` < 3) or <expr_cache><`test`.`t10`.`a`,`test`.`t10`.`b`>(<in_optimizer>(`test`.`t10`.`a`,<exists>(select `test`.`t12`.`c` from `test`.`t12` where (<cache>(`test`.`t10`.`a`) = `test`.`t12`.`c`) union select max(`test`.`t10`.`b`) from `test`.`t11` group by `test`.`t11`.`c` having (<cache>(`test`.`t10`.`a`) = <ref_null_helper>(max(`test`.`t10`.`b`)))))))
+drop table t10,t11,t12;
+#
 # End of 10.1 tests
 #
diff --git a/mysql-test/r/subselect3.result b/mysql-test/r/subselect3.result
index 0c03959a96a..31e0f66f961 100644
--- a/mysql-test/r/subselect3.result
+++ b/mysql-test/r/subselect3.result
@@ -890,6 +890,7 @@ ERROR 42S22: Unknown column 'c' in 'field list'
 SHOW WARNINGS;
 Level	Code	Message
 Note	1276	Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2
+Note	1981	Aggregate function 'count()' of SELECT #3 belongs to SELECT #2
 Note	1276	Field or reference 'test.t1.c' of SELECT #3 was resolved in SELECT #2
 Error	1054	Unknown column 'c' in 'field list'
 DROP TABLE t1;
diff --git a/mysql-test/r/subselect3_jcl6.result b/mysql-test/r/subselect3_jcl6.result
index 415963af882..8d976f8ddf8 100644
--- a/mysql-test/r/subselect3_jcl6.result
+++ b/mysql-test/r/subselect3_jcl6.result
@@ -900,6 +900,7 @@ ERROR 42S22: Unknown column 'c' in 'field list'
 SHOW WARNINGS;
 Level	Code	Message
 Note	1276	Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2
+Note	1981	Aggregate function 'count()' of SELECT #3 belongs to SELECT #2
 Note	1276	Field or reference 'test.t1.c' of SELECT #3 was resolved in SELECT #2
 Error	1054	Unknown column 'c' in 'field list'
 DROP TABLE t1;
diff --git a/mysql-test/r/subselect_mat.result b/mysql-test/r/subselect_mat.result
index a34b7d28e2e..af3df9ec811 100644
--- a/mysql-test/r/subselect_mat.result
+++ b/mysql-test/r/subselect_mat.result
@@ -1139,6 +1139,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 3	DEPENDENT SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
 Warnings:
 Note	1276	Field or reference 'test.t1.b' of SELECT #3 was resolved in SELECT #1
+Note	1981	Aggregate function 'max()' of SELECT #3 belongs to SELECT #1
 Note	1003	select `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <expr_cache><`test`.`t1`.`a`,`test`.`t1`.`b`,max(`test`.`t1`.`b`),max(`test`.`t1`.`b`)>(<in_optimizer>(`test`.`t1`.`a`,<exists>(select `test`.`t2`.`c` from `test`.`t2` where (<nop>(<expr_cache><`test`.`t2`.`d`,`test`.`t1`.`b`,max(`test`.`t1`.`b`),max(`test`.`t1`.`b`)>(<in_optimizer>(`test`.`t2`.`d`,<exists>(select `test`.`t3`.`e` from `test`.`t3` where (max(`test`.`t1`.`b`) = `test`.`t3`.`e`) having (<cache>(`test`.`t2`.`d`) >= <ref_null_helper>(`test`.`t3`.`e`)))))) and (<cache>(`test`.`t1`.`a`) = `test`.`t2`.`c`)))))
 select a from t1 group by a
 having a in (select c from t2 where d >= some(select e from t3 where max(b)=e));
diff --git a/mysql-test/r/subselect_sj_mat.result b/mysql-test/r/subselect_sj_mat.result
index 93fdcf1ccca..9aa223b83f2 100644
--- a/mysql-test/r/subselect_sj_mat.result
+++ b/mysql-test/r/subselect_sj_mat.result
@@ -1173,6 +1173,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 3	DEPENDENT SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	4	100.00	Using where
 Warnings:
 Note	1276	Field or reference 'test.t1.b' of SELECT #3 was resolved in SELECT #1
+Note	1981	Aggregate function 'max()' of SELECT #3 belongs to SELECT #1
 Note	1003	select `test`.`t1`.`a` AS `a` from `test`.`t1` group by `test`.`t1`.`a` having <expr_cache><`test`.`t1`.`a`,`test`.`t1`.`b`,max(`test`.`t1`.`b`),max(`test`.`t1`.`b`)>(<in_optimizer>(`test`.`t1`.`a`,<exists>(select `test`.`t2`.`c` from `test`.`t2` where (<nop>(<expr_cache><`test`.`t2`.`d`,`test`.`t1`.`b`,max(`test`.`t1`.`b`),max(`test`.`t1`.`b`)>(<in_optimizer>(`test`.`t2`.`d`,<exists>(select `test`.`t3`.`e` from `test`.`t3` where (max(`test`.`t1`.`b`) = `test`.`t3`.`e`) having (<cache>(`test`.`t2`.`d`) >= <ref_null_helper>(`test`.`t3`.`e`)))))) and (<cache>(`test`.`t1`.`a`) = `test`.`t2`.`c`)))))
 select a from t1 group by a
 having a in (select c from t2 where d >= some(select e from t3 where max(b)=e));
-- 
cgit v1.2.1


From a322651b8aa702e58d473edfae26606f10a089fb Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Mon, 29 Aug 2016 16:44:46 +0200
Subject: MDEV-10017: Get unexpected `Empty Set` for correlated subquery with
 aggregate functions

take into account all arguments of aggregate function
---
 mysql-test/r/func_group.result | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index dc3a0b60ad3..10d50193352 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -2397,5 +2397,40 @@ Note	1276	Field or reference 'test.t10.b' of SELECT #3 was resolved in SELECT #1
 Note	1003	select `test`.`t10`.`a` AS `a` from `test`.`t10` where ((`test`.`t10`.`c` < 3) or <expr_cache><`test`.`t10`.`a`,`test`.`t10`.`b`>(<in_optimizer>(`test`.`t10`.`a`,<exists>(select `test`.`t12`.`c` from `test`.`t12` where (<cache>(`test`.`t10`.`a`) = `test`.`t12`.`c`) union select max(`test`.`t10`.`b`) from `test`.`t11` group by `test`.`t11`.`c` having (<cache>(`test`.`t10`.`a`) = <ref_null_helper>(max(`test`.`t10`.`b`)))))))
 drop table t10,t11,t12;
 #
+# MDEV-10017: Get unexpected `Empty Set` for correlated subquery
+# with aggregate functions
+#
+create table t1(c1 int, c2 int, c3 int);
+insert into t1 values(1,1,1),(2,2,2),(3,3,3);
+select * from t1;
+c1	c2	c3
+1	1	1
+2	2	2
+3	3	3
+create table t2(c1 int, c2 int);
+insert into t2 values(2,2);
+select * from t2;
+c1	c2
+2	2
+explain extended
+select c1 from t1 having c1 >= (select t.c1 as c from t2 t order by (select min(t1.c1+c) from t2 tt));
+ERROR HY000: Invalid use of group function
+select c1 from t1 having c1 >= (select t.c1 as c from t2 t order by (select min(t1.c1+c) from t2 tt));
+ERROR HY000: Invalid use of group function
+explain extended
+select c1 from t1 having c1 >= (select t.c1 as c from t2 t order by (select min(t1.c1+tt.c1) from t2 tt));
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	
+2	DEPENDENT SUBQUERY	t	system	NULL	NULL	NULL	NULL	1	100.00	
+3	DEPENDENT SUBQUERY	tt	system	NULL	NULL	NULL	NULL	1	100.00	
+Warnings:
+Note	1276	Field or reference 'test.t1.c1' of SELECT #3 was resolved in SELECT #1
+Note	1003	select `test`.`t1`.`c1` AS `c1` from `test`.`t1` having (`test`.`t1`.`c1` >= <expr_cache><`test`.`t1`.`c1`>((select 2 AS `c` from dual order by (select min((`test`.`t1`.`c1` + 2)) from dual))))
+select c1 from t1 having c1 >= (select t.c1 as c from t2 t order by (select min(t1.c1+tt.c1) from t2 tt));
+c1
+2
+3
+drop table t1,t2;
+#
 # End of 10.1 tests
 #
-- 
cgit v1.2.1