diff options
author | Monty <monty@mariadb.org> | 2020-03-18 12:00:38 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2020-03-18 12:00:38 +0200 |
commit | 305cffebaba7a81fcc12f0c7511ffe639cb9b0d2 (patch) | |
tree | bc3047413379f91841457b449f84a3ac6c40678e /storage/oqgraph | |
parent | 36b0b302f26f59770ae12ad528e6f56c78083f4c (diff) | |
parent | 517f659e6d5eeb7e01bf19ef8b782bc2619831d4 (diff) | |
download | mariadb-git-305cffebaba7a81fcc12f0c7511ffe639cb9b0d2.tar.gz |
merge 10.4 to 10.5
Diffstat (limited to 'storage/oqgraph')
-rw-r--r-- | storage/oqgraph/mysql-test/oqgraph/regression_mdev6282.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/oqgraph/mysql-test/oqgraph/regression_mdev6282.result b/storage/oqgraph/mysql-test/oqgraph/regression_mdev6282.result index e0d9b3efe99..3ef61cc3e37 100644 --- a/storage/oqgraph/mysql-test/oqgraph/regression_mdev6282.result +++ b/storage/oqgraph/mysql-test/oqgraph/regression_mdev6282.result @@ -28,12 +28,14 @@ SELECT `db`.`version`, `db`.`nodeID` FROM `version_history` AS `v` INNER JOIN `db_history` AS `db` ON `db`.`nodeID` = `v`.`linkid` WHERE `latch` = 'breadth_first' AND `origid` = '1' ORDER BY `weight` DESC LIMIT 1; version nodeID +0.0.3 3 disconnect con1; connect con2,localhost,root,,test; SELECT `db`.`version`, `db`.`nodeID` FROM `version_history` AS `v` INNER JOIN `db_history` AS `db` ON `db`.`nodeID` = `v`.`linkid` WHERE `latch` = 'breadth_first' AND `origid` = '1' ORDER BY `weight` DESC LIMIT 1; version nodeID +0.0.3 3 disconnect con2; connect con3,localhost,root,,test; DROP TABLE version_history; |