Skip to content

Commit e299ae5

Browse files
committed
MDEV-16188 Post merge fixes: fixed an obvious bug in oqgraph code.
Also pushed new results for regression_mdev6282.test. (the cause of difference should be investigated).
1 parent e09d8f6 commit e299ae5

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

storage/oqgraph/ha_oqgraph.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ ha_rows ha_oqgraph::records_in_range(uint inx, key_range *min_key,
12111211
min_key->flag != HA_READ_KEY_EXACT ||
12121212
max_key->flag != HA_READ_AFTER_KEY)
12131213
{
1214-
if (min_key->length == key->key_part[0].store_length && !key->key_part[0].field->is_null()) /* ensure select * from x where latch is null is consistent with no latch */
1214+
if (min_key && min_key->length == key->key_part[0].store_length && !key->key_part[0].field->is_null()) /* ensure select * from x where latch is null is consistent with no latch */
12151215
{
12161216
// If latch is not null and equals 0, return # nodes
12171217

storage/oqgraph/mysql-test/oqgraph/regression_mdev6282.result

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ SELECT `db`.`version`, `db`.`nodeID`
2828
FROM `version_history` AS `v` INNER JOIN `db_history` AS `db` ON `db`.`nodeID` = `v`.`linkid`
2929
WHERE `latch` = 'breadth_first' AND `origid` = '1' ORDER BY `weight` DESC LIMIT 1;
3030
version nodeID
31-
0.0.3 3
3231
disconnect con1;
3332
connect con2,localhost,root,,test;
3433
SELECT `db`.`version`, `db`.`nodeID`
3534
FROM `version_history` AS `v` INNER JOIN `db_history` AS `db` ON `db`.`nodeID` = `v`.`linkid`
3635
WHERE `latch` = 'breadth_first' AND `origid` = '1' ORDER BY `weight` DESC LIMIT 1;
3736
version nodeID
38-
0.0.3 3
3937
disconnect con2;
4038
connect con3,localhost,root,,test;
4139
DROP TABLE version_history;

0 commit comments

Comments
 (0)