summaryrefslogtreecommitdiff
path: root/storage/oqgraph/mysql-test
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2014-01-09 22:01:12 +0200
committerMichael Widenius <monty@askmonty.org>2014-01-09 22:01:12 +0200
commit659304d410dc56103a9045e1e3476bc530f35398 (patch)
tree7001fe68962ae20240e97d63b2edba562adafeda /storage/oqgraph/mysql-test
parent273078c5faa19b60e2cc93330d18534fae221487 (diff)
downloadmariadb-git-659304d410dc56103a9045e1e3476bc530f35398.tar.gz
Cleanups:
- Updated help for mysql-test-run - Added OQGraph to all cmake error output regarding OQGraph to make it easier to spot problems - Suppressed warning messages from OQGraph - Added test for version_malloc_library variable mysql-test/mysql-test-run.pl: Updated help mysql-test/suite/sys_vars/r/version_malloc_library_basic.result: Added test for version_malloc_library variable mysql-test/suite/sys_vars/t/version_malloc_library_basic.test: Added test for version_malloc_library variable storage/oqgraph/CMakeLists.txt: Added OQGraph to all cmake error output regarding OQGraph to make it easier to spot problems storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/invalid_operations.result: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/invalid_operations.test: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/isnull.result: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/isnull.test: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/regression_1233113.result: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/regression_1233113.test: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test: Suppressed warning messages
Diffstat (limited to 'storage/oqgraph/mysql-test')
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result1
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test2
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/invalid_operations.result1
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/invalid_operations.test2
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/isnull.result2
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/isnull.test3
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/regression_1233113.result1
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/regression_1233113.test2
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result1
-rw-r--r--storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test2
10 files changed, 14 insertions, 3 deletions
diff --git a/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result b/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result
index 9aa806eace9..7cb65bc07ea 100644
--- a/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result
+++ b/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result
@@ -1,6 +1,7 @@
DROP TABLE IF EXISTS graph_base;
DROP TABLE IF EXISTS graph;
DROP TABLE IF EXISTS graph2;
+call mtr.add_suppression("graph_base is open on delete");
CREATE TABLE graph2 (
latch VARCHAR(32) NULL,
origid BIGINT UNSIGNED NULL,
diff --git a/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test b/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test
index 869994aa208..a6dae0e2678 100644
--- a/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test
+++ b/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test
@@ -4,6 +4,8 @@ DROP TABLE IF EXISTS graph;
DROP TABLE IF EXISTS graph2;
--enable_warnings
+call mtr.add_suppression("graph_base is open on delete");
+
CREATE TABLE graph2 (
latch VARCHAR(32) NULL,
origid BIGINT UNSIGNED NULL,
diff --git a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result
index 046c468b768..49639c278d0 100644
--- a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result
+++ b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result
@@ -1,5 +1,6 @@
DROP TABLE IF EXISTS graph_base;
DROP TABLE IF EXISTS graph;
+call mtr.add_suppression("graph_base is open on delete");
CREATE TABLE graph_base (
from_id INT UNSIGNED NOT NULL,
to_id INT UNSIGNED NOT NULL,
diff --git a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test
index 8f79b23ed43..cab99ec5018 100644
--- a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test
+++ b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test
@@ -3,6 +3,8 @@ DROP TABLE IF EXISTS graph_base;
DROP TABLE IF EXISTS graph;
--enable_warnings
+call mtr.add_suppression("graph_base is open on delete");
+
# Create the backing store
CREATE TABLE graph_base (
from_id INT UNSIGNED NOT NULL,
diff --git a/storage/oqgraph/mysql-test/oqgraph/isnull.result b/storage/oqgraph/mysql-test/oqgraph/isnull.result
index 38ebf12413c..d9af33222dc 100644
--- a/storage/oqgraph/mysql-test/oqgraph/isnull.result
+++ b/storage/oqgraph/mysql-test/oqgraph/isnull.result
@@ -38,5 +38,5 @@ NULL 1 NULL 1 1 2
select * from graph where latch is null and destid=2;
latch origid destid weight seq linkid
NULL NULL 2 1 1 1
-DROP TABLE graph_base;
DROP TABLE graph;
+DROP TABLE graph_base;
diff --git a/storage/oqgraph/mysql-test/oqgraph/isnull.test b/storage/oqgraph/mysql-test/oqgraph/isnull.test
index 93105887834..dc7622daa0d 100644
--- a/storage/oqgraph/mysql-test/oqgraph/isnull.test
+++ b/storage/oqgraph/mysql-test/oqgraph/isnull.test
@@ -34,6 +34,5 @@ select * from graph where latch is null;
select * from graph where latch is null and origid=1;
select * from graph where latch is null and destid=2;
-DROP TABLE graph_base;
DROP TABLE graph;
-
+DROP TABLE graph_base;
diff --git a/storage/oqgraph/mysql-test/oqgraph/regression_1233113.result b/storage/oqgraph/mysql-test/oqgraph/regression_1233113.result
index 415b2181bbb..2b0ea4b2acb 100644
--- a/storage/oqgraph/mysql-test/oqgraph/regression_1233113.result
+++ b/storage/oqgraph/mysql-test/oqgraph/regression_1233113.result
@@ -1,5 +1,6 @@
DROP TABLE IF EXISTS graph_base;
DROP TABLE IF EXISTS graph;
+call mtr.add_suppression("graph_base is open on delete");
CREATE TABLE graph_base (
from_id INT UNSIGNED NOT NULL,
to_id INT UNSIGNED NOT NULL,
diff --git a/storage/oqgraph/mysql-test/oqgraph/regression_1233113.test b/storage/oqgraph/mysql-test/oqgraph/regression_1233113.test
index 26e6656eea5..db53b2b39ae 100644
--- a/storage/oqgraph/mysql-test/oqgraph/regression_1233113.test
+++ b/storage/oqgraph/mysql-test/oqgraph/regression_1233113.test
@@ -3,6 +3,8 @@ DROP TABLE IF EXISTS graph_base;
DROP TABLE IF EXISTS graph;
--enable_warnings
+call mtr.add_suppression("graph_base is open on delete");
+
# Create the backing store
CREATE TABLE graph_base (
from_id INT UNSIGNED NOT NULL,
diff --git a/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result b/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result
index 84902676ef2..cace2c40564 100644
--- a/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result
+++ b/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result
@@ -1,5 +1,6 @@
DROP TABLE IF EXISTS graph_base;
DROP TABLE IF EXISTS graph;
+call mtr.add_suppression("graph_base is open on delete");
CREATE TABLE graph_base (
from_id INT UNSIGNED NOT NULL,
to_id INT UNSIGNED NOT NULL,
diff --git a/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test b/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test
index b6f4418112c..673eb867032 100644
--- a/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test
+++ b/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test
@@ -3,6 +3,8 @@ DROP TABLE IF EXISTS graph_base;
DROP TABLE IF EXISTS graph;
--enable_warnings
+call mtr.add_suppression("graph_base is open on delete");
+
# Create the backing store
CREATE TABLE graph_base (
from_id INT UNSIGNED NOT NULL,
View Lorry Controller Status