mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 17:33:44 +01:00
f5536380a3
ChangeSet@1.2509, 2007-08-28 http://lists.mysql.com/commits/33239 Fixes for the funcs_1 datadict test bugs #30418 "datadict" tests (all engines) fail: Dependency on the host name for ordering #30420 "datadict" tests (all engines) fail: Release build has help tables loaded #30438 "{memory,myisam,ndb}__datadict" tests fail: Use "InnoDB" without checking #30440 "datadict" tests (all engines) fail: Character sets depend on configuration mysql-test/suite/funcs_1/README.txt: Improved README mysql-test/suite/funcs_1/datadict/datadict_load.inc: Additions for the NDB variant (currently not in use) mysql-test/suite/funcs_1/datadict/datadict_master.inc: Write a comment about Bug#30689 into the test protocols. mysql-test/suite/funcs_1/datadict/processlist_priv.inc: Fix for a not reported bug. The missing revoke usage and drop user harmed the next test. mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result: Updated results mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result: Updated results mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated results mysql-test/suite/funcs_1/r/memory__datadict.result: Updated results mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated results mysql-test/suite/funcs_1/r/ndb__datadict.result: Updated results as far as they could be corrected. Attention: This test failed even before the current bug fixes. The updated expected results are now better than before, but they do not prevent that the test fails. It looks like one script is "damaged" and treats this NDB test different than expected within the file with expected results.
137 lines
4.9 KiB
PHP
137 lines
4.9 KiB
PHP
#### suite/funcs_1/datadict/datadict_load.inc
|
|
#
|
|
# The sub testcases are nearly independend. That is the reason why we do not
|
|
# want to abort after the first error.
|
|
--disable_abort_on_error
|
|
|
|
################################################################################
|
|
#
|
|
# prepare variables for --replace_result
|
|
#
|
|
################################################################################
|
|
--disable_query_log
|
|
|
|
# ------------------------------------------------------------------------------
|
|
# Get the size of ONE known colum and check the size against some values to
|
|
# be able to use the correct --replace_result statement. Using this only the
|
|
# one pair of 'wrong' values is replaced and not all occurrencies of all
|
|
# possible pairs of values. See bug #12777 for details.
|
|
SELECT character_maximum_length INTO @CML
|
|
FROM information_schema.columns
|
|
WHERE table_schema = 'information_schema'
|
|
AND table_name = 'columns'
|
|
AND column_name = 'table_catalog';
|
|
|
|
let $bug_12777_0512= `SELECT @CML = 512`;
|
|
let $bug_12777_1023= `SELECT @CML = 1023`;
|
|
let $bug_12777_1024= `SELECT @CML = 1024`;
|
|
let $bug_12777_2048= `SELECT @CML = 2048`;
|
|
# 4096 is the value used in the .results
|
|
let $bug_12777_4095= `SELECT @CML = 4095`;
|
|
|
|
if (0)
|
|
{
|
|
# enable this for debugging only, but NOT in a pushed version, as then the
|
|
# result changes from OS to OS ...
|
|
eval SELECT @CML AS 'CML',
|
|
$bug_12777_0512 AS '512',
|
|
$bug_12777_1023 AS '1023',
|
|
$bug_12777_1024 AS '1024',
|
|
$bug_12777_2048 AS '2048',
|
|
$bug_12777_4095 AS '4095';
|
|
}
|
|
|
|
# ------------------------------------------------------------------------------
|
|
# prepare a variable to be able to suppress machine dependant diffs
|
|
# this can be used in: --replace_result $SERVER_NAME <SERVER_NAME>
|
|
# let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host LIKE "%\%" AND host NOT In ("localhost", "127.0.0.1", "%")`;
|
|
let $SERVER_NAME= `SELECT DISTINCT host FROM mysql.user WHERE host NOT In ("localhost", "127.0.0.1", "%")`;
|
|
|
|
|
|
################################################################################
|
|
#
|
|
# load tables
|
|
# -----------
|
|
#
|
|
# this was part of the 4 files $<engine>_datadict.test, but it has been moved
|
|
# here to have only one place where all preparation for the test is done.
|
|
#
|
|
################################################################################
|
|
|
|
eval SET @ENGINE_INNODB = IF( '$engine_type' = 'innodb', 1, 0);
|
|
eval SET @ENGINE_MEMORY = IF( '$engine_type' = 'memory', 1, 0);
|
|
eval SET @ENGINE_MYISAM = IF( '$engine_type' = 'myisam', 1, 0);
|
|
eval SET @ENGINE_NDB = IF( '$engine_type' = 'ndb', 1, 0);
|
|
--enable_query_log
|
|
|
|
let $engine_myisam= `SELECT @ENGINE_MYISAM = 1`;
|
|
let $engine_innodb= `SELECT @ENGINE_INNODB = 1`;
|
|
let $engine_memory= `SELECT @ENGINE_MEMORY = 1`;
|
|
let $engine_ndb= `SELECT @ENGINE_NDB = 1`;
|
|
# Note: The NDB variant with their own tb1 - tb4 tables is not ready for use.
|
|
let $engine_ndb= 0;
|
|
|
|
# Decide, if the objects are to be (re)created
|
|
#
|
|
# - once at the beginning of a set of testcases ('$NO_REFRESH' <> '' --> TRUE)
|
|
# That means the current script must not (re)create any object.
|
|
# It can expect, that the objects already exist.
|
|
#
|
|
# - per every testscript/case ('$NO_REFRESH' = '' --> FALSE)
|
|
# That means all objects have to be (re)created within the current script.
|
|
#
|
|
eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
|
|
let $run= `SELECT @NO_REFRESH = 0`;
|
|
if ($run)
|
|
{
|
|
--disable_warnings
|
|
DROP DATABASE IF EXISTS test1;
|
|
--enable_warnings
|
|
CREATE DATABASE test1;
|
|
USE test;
|
|
|
|
# until a statement 'eval --source suite/funcs_1/include/$var_tb1.inc
|
|
# works we need to have similar statements for each $engine
|
|
if ($engine_innodb)
|
|
{
|
|
--source suite/funcs_1/include/innodb_tb1.inc
|
|
--source suite/funcs_1/include/innodb_tb2.inc
|
|
--source suite/funcs_1/include/innodb_tb3.inc
|
|
--source suite/funcs_1/include/innodb_tb4.inc
|
|
USE test1;
|
|
--source suite/funcs_1/include/innodb_tb2.inc
|
|
}
|
|
|
|
if ($engine_memory)
|
|
{
|
|
--source suite/funcs_1/include/memory_tb1.inc
|
|
--source suite/funcs_1/include/memory_tb2.inc
|
|
--source suite/funcs_1/include/memory_tb3.inc
|
|
--source suite/funcs_1/include/memory_tb4.inc
|
|
USE test1;
|
|
--source suite/funcs_1/include/memory_tb2.inc
|
|
}
|
|
|
|
if ($engine_myisam)
|
|
{
|
|
--source suite/funcs_1/include/myisam_tb1.inc
|
|
--source suite/funcs_1/include/myisam_tb2.inc
|
|
--source suite/funcs_1/include/myisam_tb3.inc
|
|
--source suite/funcs_1/include/myisam_tb4.inc
|
|
USE test1;
|
|
--source suite/funcs_1/include/myisam_tb2.inc
|
|
}
|
|
|
|
if ($engine_ndb)
|
|
{
|
|
--source suite/funcs_1/include/ndb_tb1.inc
|
|
--source suite/funcs_1/include/ndb_tb2.inc
|
|
--source suite/funcs_1/include/ndb_tb3.inc
|
|
--source suite/funcs_1/include/ndb_tb4.inc
|
|
USE test1;
|
|
--source suite/funcs_1/include/ndb_tb2.inc
|
|
}
|
|
|
|
USE test;
|
|
--source suite/funcs_1/include/sp_tb.inc
|
|
}
|