Commit 659304d4 authored by Michael Widenius's avatar Michael Widenius

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
parent 273078c5
......@@ -6318,7 +6318,20 @@ sub usage ($) {
$0 [ OPTIONS ] [ TESTCASE ]
Options to control what engine/variation to run
Where test case can be specified as:
testcase[.test] Runs the test case named 'testcase' from all suits
path-to-testcase
[suite.]testcase[,combination]
Examples:
alias
main.alias 'main' is the name of the suite for the 't' directory.
rpl.rpl_invoked_features,mix,xtradb_plugin
suite/rpl/t/rpl.rpl_invoked_features
Options to control what engine/variation to run:
embedded-server Use the embedded server, i.e. no mysqld daemons
ps-protocol Use the binary protocol between client and server
......
'#---------------------BS_STVARS_053_01----------------------#'
SELECT COUNT(@@GLOBAL.version_malloc_library);
COUNT(@@GLOBAL.version_malloc_library)
1
1 Expected
'#---------------------BS_STVARS_053_02----------------------#'
SET @@GLOBAL.version_malloc_library=1;
ERROR HY000: Variable 'version_malloc_library' is a read only variable
Expected error 'Read only variable'
SELECT COUNT(@@GLOBAL.version_malloc_library);
COUNT(@@GLOBAL.version_malloc_library)
1
1 Expected
'#---------------------BS_STVARS_053_03----------------------#'
SELECT @@GLOBAL.version_malloc_library = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='version_malloc_library';
@@GLOBAL.version_malloc_library = VARIABLE_VALUE
1
1 Expected
SELECT COUNT(@@GLOBAL.version_malloc_library);
COUNT(@@GLOBAL.version_malloc_library)
1
1 Expected
SELECT COUNT(VARIABLE_VALUE)
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='version_malloc_library';
COUNT(VARIABLE_VALUE)
1
1 Expected
'#---------------------BS_STVARS_053_04----------------------#'
SELECT @@version_malloc_library = @@GLOBAL.version_malloc_library;
@@version_malloc_library = @@GLOBAL.version_malloc_library
1
1 Expected
'#---------------------BS_STVARS_053_05----------------------#'
SELECT COUNT(@@version_malloc_library);
COUNT(@@version_malloc_library)
1
1 Expected
SELECT COUNT(@@local.version_malloc_library);
ERROR HY000: Variable 'version_malloc_library' is a GLOBAL variable
Expected error 'Variable is a GLOBAL variable'
SELECT COUNT(@@SESSION.version_malloc_library);
ERROR HY000: Variable 'version_malloc_library' is a GLOBAL variable
Expected error 'Variable is a GLOBAL variable'
SELECT COUNT(@@GLOBAL.version_malloc_library);
COUNT(@@GLOBAL.version_malloc_library)
1
1 Expected
SELECT version_malloc_library = @@SESSION.version;
ERROR 42S22: Unknown column 'version_malloc_library' in 'field list'
Expected error 'Readonly variable'
################## mysql-test\t\version_malloc_library.test ###################
# #
# Variable Name: version_malloc_library #
# Scope: Global #
# Access Type: Static #
# Data Type: String #
# #
# Description:Test Cases of Dynamic System Variable version #
# that checks the behavior of this variable in the following ways #
# * Value Check #
# * Scope Check #
# #
###############################################################################
--echo '#---------------------BS_STVARS_053_01----------------------#'
####################################################################
# Displaying default value #
####################################################################
SELECT COUNT(@@GLOBAL.version_malloc_library);
--echo 1 Expected
--echo '#---------------------BS_STVARS_053_02----------------------#'
####################################################################
# Check if Value can set #
####################################################################
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
SET @@GLOBAL.version_malloc_library=1;
--echo Expected error 'Read only variable'
SELECT COUNT(@@GLOBAL.version_malloc_library);
--echo 1 Expected
--echo '#---------------------BS_STVARS_053_03----------------------#'
#################################################################
# Check if the value in GLOBAL Table matches value in variable #
#################################################################
SELECT @@GLOBAL.version_malloc_library = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='version_malloc_library';
--echo 1 Expected
SELECT COUNT(@@GLOBAL.version_malloc_library);
--echo 1 Expected
SELECT COUNT(VARIABLE_VALUE)
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='version_malloc_library';
--echo 1 Expected
--echo '#---------------------BS_STVARS_053_04----------------------#'
###############################################################################
# Check if accessing variable with and without GLOBAL point to same variable #
###############################################################################
SELECT @@version_malloc_library = @@GLOBAL.version_malloc_library;
--echo 1 Expected
--echo '#---------------------BS_STVARS_053_05----------------------#'
###############################################################################
# Check if version_malloc_library can be accessed with and without @@ sign #
###############################################################################
SELECT COUNT(@@version_malloc_library);
--echo 1 Expected
--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT COUNT(@@local.version_malloc_library);
--echo Expected error 'Variable is a GLOBAL variable'
--Error ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT COUNT(@@SESSION.version_malloc_library);
--echo Expected error 'Variable is a GLOBAL variable'
SELECT COUNT(@@GLOBAL.version_malloc_library);
--echo 1 Expected
--Error ER_BAD_FIELD_ERROR
SELECT version_malloc_library = @@SESSION.version;
--echo Expected error 'Readonly variable'
......@@ -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)
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,
......
......@@ -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,
......
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,
......
......@@ -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,
......
......@@ -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;
......@@ -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;
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,
......
......@@ -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,
......
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,
......
......@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment