mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 02:05:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.0 into 10.1

Browse source
This commit is contained in:
Marko Mäkelä 2017-03-03 13:27:12 +02:00
commit adc91387e3
68 changed files with 1283 additions and 648 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/oqgraph/mysql-test/oqgraph/regression_mdev6282.result
View file

@ -33,5 +33,5 @@ FROM `version_history` AS `v` INNER JOIN `db_history` AS `db` ON `db`.`nodeID` =
WHERE `latch` = 'breadth_first' AND `origid` = '1' ORDER BY `weight` DESC LIMIT 1;
version nodeID
0.0.3 3
DROP TABLE db_history;
DROP TABLE version_history;
DROP TABLE db_history;

2
storage/oqgraph/mysql-test/oqgraph/regression_mdev6282.test
View file

@ -40,8 +40,8 @@
--disconnect con2
--connect (con3,localhost,root,,test)
DROP TABLE db_history;
DROP TABLE version_history;
DROP TABLE db_history;
--disconnect con3

2
storage/oqgraph/mysql-test/oqgraph/regression_mdev6345.result
View file

@ -8,5 +8,5 @@ latch origid destid weight seq linkid
breadth_first 1 6 NULL 0 1
breadth_first 1 6 1 1 2
breadth_first 1 6 1 2 6
DROP TABLE IF EXISTS oq_backing;
DROP TABLE IF EXISTS oq_graph;
DROP TABLE IF EXISTS oq_backing;

2
storage/oqgraph/mysql-test/oqgraph/regression_mdev6345.test
View file

@ -14,6 +14,6 @@ CREATE TABLE oq_graph (latch VARCHAR(32) NULL, origid BIGINT UNSIGNED NULL, dest
SELECT * FROM oq_graph WHERE latch='breadth_first' AND origid=1 AND destid=6;
DROP TABLE IF EXISTS oq_backing;
DROP TABLE IF EXISTS oq_graph;
DROP TABLE IF EXISTS oq_backing;