Automatic merge

11 files changed, 18 insertions, 6 deletions

diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt
index 74d05873f6f..3f592133969 100644
--- a/storage/oqgraph/CMakeLists.txt
+++ b/storage/oqgraph/CMakeLists.txt
@@ -3,14 +3,14 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 MESSAGE(STATUS "Configuring OQGraph")
 FIND_PACKAGE(Boost)
 IF(NOT Boost_FOUND)
-   MESSAGE(STATUS "Boost not found")
+   MESSAGE(STATUS "Boost not found. OQGraph will not be compiled")
   RETURN()
 ENDIF()
 INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})
 
 FIND_PACKAGE(Judy)
 IF(NOT Judy_FOUND)
-  MESSAGE(STATUS "Judy not found")
+  MESSAGE(STATUS "Judy not found. OQGraph will not be compiled")
   RETURN()
 ENDIF()
 INCLUDE_DIRECTORIES(${Judy_INCLUDE_DIR})
@@ -53,6 +53,7 @@ IF(BOOST_OK)
                    MODULE_ONLY
                    COMPONENT oqgraph-engine
                    LINK_LIBRARIES ${Judy_LIBRARIES})
+  MESSAGE(STATUS "OQGraph OK")
 ELSE(BOOST_OK)
-  MESSAGE(STATUS "Requisites for OQGraph not met")
+  MESSAGE(STATUS "Requisites for OQGraph not met. OQGraph will not be compiled")
 ENDIF(BOOST_OK)
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,