summaryrefslogtreecommitdiff
path: root/storage/oqgraph/mysql-test
diff options
context:
space:
mode:
authorandrew <andrew@atlantis4.andrewmcdonnell.net>2014-04-02 23:06:35 +1030
committerandrew <andrew@atlantis4.andrewmcdonnell.net>2014-04-02 23:06:35 +1030
commit965bebcdaf4dcc368d5b9ccce62a39defc5ba9a9 (patch)
tree49eae6560d8e2d10d48f9399d25af14b2f9a3b3b /storage/oqgraph/mysql-test
parent316aef5b7f6dab060e4c1dd0e0c0f34b8e7441d3 (diff)
downloadmariadb-git-965bebcdaf4dcc368d5b9ccce62a39defc5ba9a9.tar.gz
Update test suite results after fixing MDEV-5891
Diffstat (limited to 'storage/oqgraph/mysql-test')
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/general-Aria.result2
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/general-MyISAM.result2
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/general-innodb.result2
-rwxr-xr-xstorage/oqgraph/mysql-test/oqgraph/generate_backing_table_tests_suite.sh3
-rwxr-xr-xstorage/oqgraph/mysql-test/oqgraph/maintainer-general-record.sh1
5 files changed, 8 insertions, 2 deletions
diff --git a/storage/oqgraph/mysql-test/oqgraph/general-Aria.result b/storage/oqgraph/mysql-test/oqgraph/general-Aria.result
index db75c83cd8d..f0c5b51a266 100644
--- a/storage/oqgraph/mysql-test/oqgraph/general-Aria.result
+++ b/storage/oqgraph/mysql-test/oqgraph/general-Aria.result
@@ -18,6 +18,8 @@ linkid BIGINT UNSIGNED NULL,
KEY (latch, origid, destid) USING HASH,
KEY (latch, destid, origid) USING HASH
) ENGINE=OQGRAPH DATA_TABLE='graph_base' ORIGID='from_id', DESTID='to_id';
+select * from graph;
+latch origid destid weight seq linkid
INSERT INTO graph_base(from_id, to_id) VALUES (1,2), (2,1);
INSERT INTO graph_base(from_id, to_id) VALUES (1,3), (3,1);
INSERT INTO graph_base(from_id, to_id) VALUES (3,4), (4,3);
diff --git a/storage/oqgraph/mysql-test/oqgraph/general-MyISAM.result b/storage/oqgraph/mysql-test/oqgraph/general-MyISAM.result
index 9fd630cd280..c08e0c295d2 100644
--- a/storage/oqgraph/mysql-test/oqgraph/general-MyISAM.result
+++ b/storage/oqgraph/mysql-test/oqgraph/general-MyISAM.result
@@ -18,6 +18,8 @@ linkid BIGINT UNSIGNED NULL,
KEY (latch, origid, destid) USING HASH,
KEY (latch, destid, origid) USING HASH
) ENGINE=OQGRAPH DATA_TABLE='graph_base' ORIGID='from_id', DESTID='to_id';
+select * from graph;
+latch origid destid weight seq linkid
INSERT INTO graph_base(from_id, to_id) VALUES (1,2), (2,1);
INSERT INTO graph_base(from_id, to_id) VALUES (1,3), (3,1);
INSERT INTO graph_base(from_id, to_id) VALUES (3,4), (4,3);
diff --git a/storage/oqgraph/mysql-test/oqgraph/general-innodb.result b/storage/oqgraph/mysql-test/oqgraph/general-innodb.result
index 8b12cb0a7bf..cf9c83144b8 100644
--- a/storage/oqgraph/mysql-test/oqgraph/general-innodb.result
+++ b/storage/oqgraph/mysql-test/oqgraph/general-innodb.result
@@ -18,6 +18,8 @@ linkid BIGINT UNSIGNED NULL,
KEY (latch, origid, destid) USING HASH,
KEY (latch, destid, origid) USING HASH
) ENGINE=OQGRAPH DATA_TABLE='graph_base' ORIGID='from_id', DESTID='to_id';
+select * from graph;
+latch origid destid weight seq linkid
INSERT INTO graph_base(from_id, to_id) VALUES (1,2), (2,1);
INSERT INTO graph_base(from_id, to_id) VALUES (1,3), (3,1);
INSERT INTO graph_base(from_id, to_id) VALUES (3,4), (4,3);
diff --git a/storage/oqgraph/mysql-test/oqgraph/generate_backing_table_tests_suite.sh b/storage/oqgraph/mysql-test/oqgraph/generate_backing_table_tests_suite.sh
index 618130fa480..087b2b7089c 100755
--- a/storage/oqgraph/mysql-test/oqgraph/generate_backing_table_tests_suite.sh
+++ b/storage/oqgraph/mysql-test/oqgraph/generate_backing_table_tests_suite.sh
@@ -30,7 +30,8 @@ EOF
done
# These engines need an extra check to see if thy are compiled
-ENGINES2="innodb xtradb"
+# Note, including innodb will also test xtradb
+ENGINES2="innodb"
for ENGINE in $ENGINES2 ; do
cat > general-$ENGINE.test <<EOF
# This is a maintainer generated file. Generated at `date`.
diff --git a/storage/oqgraph/mysql-test/oqgraph/maintainer-general-record.sh b/storage/oqgraph/mysql-test/oqgraph/maintainer-general-record.sh
index feb16f2a9a4..bc684015055 100755
--- a/storage/oqgraph/mysql-test/oqgraph/maintainer-general-record.sh
+++ b/storage/oqgraph/mysql-test/oqgraph/maintainer-general-record.sh
@@ -3,4 +3,3 @@ mysql-test/mysql-test-run --record oqgraph.general-MyISAM
mysql-test/mysql-test-run --record oqgraph.general-MEMORY
mysql-test/mysql-test-run --record oqgraph.general-Aria
mysql-test/mysql-test-run --record oqgraph.general-innodb
-mysql-test/mysql-test-run --record oqgraph.general-xtradb