BUG#26553164 - INNODB PARTITION TABLE HAS UNEXPECTED ROW LOCK

This is similar issue to bug#26731025, the only difference is that
this one is for ordered index scan, while the other one is for
unordered index scan. The cause is same too, that is for the equal
range scan, it used to call improper read_range* function and set
an incorrect lock to the record, which leads to the final lock waiting.
The fix is that for equal range scan, call the proper
index_next_same_in_part() to set a proper record to previous locking
waiting.

RB: 19528
Reviewed-by: Debarun Banerjee (debarun.banerjee@oracle.com)

Author: Bin Su

mysql-test/r/partition_innodb.result

@@ -1334,3 +1334,36 @@ TABLE_NAME = 't1' ORDER BY PARTITION_ORDINAL_POSITION;
 TABLE_NAME	COUNT(UPDATE_TIME)
 t1	1
 DROP TABLE t1;
+
+BUG#26553164 - INNODB PARTITION TABLE HAS UNEXPECTED ROW LOCK
+
+CREATE TABLE `t1` (
+`id` int(11) NOT NULL,
+`dt` datetime NOT NULL,
+`data` varchar(10) DEFAULT NULL,
+PRIMARY KEY (`id`,`dt`),
+KEY `idx_dt` (`dt`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (to_days(dt))
+(PARTITION p20170218 VALUES LESS THAN (736744) ENGINE = InnoDB,
+PARTITION p20170219 VALUES LESS THAN (736745) ENGINE = InnoDB,
+PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */;
+INSERT INTO t1 VALUES (1, '2018-04-25 10:18:00', '1');
+INSERT INTO t1 VALUES (2, '2018-04-25 10:18:01', '2');
+INSERT INTO t1 VALUES (3, '2018-04-25 10:18:02', '3');
+SELECT * FROM t1;
+id	dt	data
+1	2018-04-25 10:18:00	1
+2	2018-04-25 10:18:01	2
+3	2018-04-25 10:18:02	3
+begin;
+UPDATE t1 SET data = '11' WHERE id = 1;
+begin;
+UPDATE t1 SET data = '22' WHERE id = 2;
+commit;
+SELECT * FROM t1;
+id	dt	data
+1	2018-04-25 10:18:00	11
+2	2018-04-25 10:18:01	22
+3	2018-04-25 10:18:02	3
+DROP TABLE t1;

mysql-test/t/partition_innodb.test

@@ -1319,3 +1319,45 @@ FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA = 'test' AND
 TABLE_NAME = 't1' ORDER BY PARTITION_ORDINAL_POSITION;
 
 DROP TABLE t1;
+
+
+--echo
+--echo BUG#26553164 - INNODB PARTITION TABLE HAS UNEXPECTED ROW LOCK
+--echo
+
+--connect (conn1,localhost,root,,)
+
+--connection default
+
+CREATE TABLE `t1` (
+  `id` int(11) NOT NULL,
+  `dt` datetime NOT NULL,
+  `data` varchar(10) DEFAULT NULL,
+  PRIMARY KEY (`id`,`dt`),
+  KEY `idx_dt` (`dt`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE (to_days(dt))
+(PARTITION p20170218 VALUES LESS THAN (736744) ENGINE = InnoDB,
+ PARTITION p20170219 VALUES LESS THAN (736745) ENGINE = InnoDB,
+ PARTITION pMax VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */;
+
+INSERT INTO t1 VALUES (1, '2018-04-25 10:18:00', '1');
+INSERT INTO t1 VALUES (2, '2018-04-25 10:18:01', '2');
+INSERT INTO t1 VALUES (3, '2018-04-25 10:18:02', '3');
+
+SELECT * FROM t1;
+
+begin;
+UPDATE t1 SET data = '11' WHERE id = 1;
+
+--connection conn1
+begin;
+UPDATE t1 SET data = '22' WHERE id = 2;
+commit;
+
+--disconnect conn1
+
+--connection default
+SELECT * FROM t1;
+
+DROP TABLE t1;

sql/partitioning/partition_handler.cc

@@ -3530,20 +3530,20 @@ int Partition_helper::handle_ordered_next(uchar *buf, bool is_next_same)
   else
     read_buf= rec_buf;
 
-
-  if (m_index_scan_type == PARTITION_READ_RANGE)
-  {
-    error= read_range_next_in_part(part_id,
-                                   read_buf == m_table->record[0]
-                                     ? NULL : read_buf);
-  }
-  else if (!is_next_same)
-    error= index_next_in_part(part_id, read_buf);
-  else
-    error= index_next_same_in_part(part_id,
+  if (is_next_same) {
+    error = index_next_same_in_part(part_id,
                                    read_buf,
                                    m_start_key.key,
                                    m_start_key.length);
+  } else if (m_index_scan_type == PARTITION_READ_RANGE) {
+    error = read_range_next_in_part(part_id,
+                                   read_buf == m_table->record[0]
+                                     ? NULL : read_buf);
+  }
+  else {
+    error = index_next_in_part(part_id, read_buf);
+  }
+
   if (error)
   {
     if (error == HA_ERR_END_OF_FILE)