mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
89ddc0aa52
Bug#35335 funcs_1: Some tests fail within load_file during
pushbuild runs
Solution: 1. Move files with input data used in load_file,
load data etc.
from suite/funcs_1/<whatever>
to std_data
2. Use for testsuite funcs_1 the server option
--secure-file-priv=<MYSQLTEST_VARDIR>
3. Outfiles have to be stored under MYSQLTEST_VARDIR
+ changes according to WL#4304 Cleanup in funcs_1 tests
- backport of fixes/improvements made in 5.1 to 5.0
The differences between scripts in 5.0 and 5.1 cause
much additional and annoying work during any upmerge.
- replace error numbers with names
- improved comments
- improved formatting
- Unify storage engine names so that result files for
storage engine variants do not differ (some tests)
- remove a script no more used (tests are done in other scripts)
106 lines
3.7 KiB
PHP
106 lines
3.7 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 3 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);
|
|
--enable_query_log
|
|
|
|
let $engine_myisam= `SELECT @ENGINE_MYISAM = 1`;
|
|
let $engine_innodb= `SELECT @ENGINE_INNODB = 1`;
|
|
let $engine_memory= `SELECT @ENGINE_MEMORY = 1`;
|
|
|
|
--disable_warnings
|
|
DROP DATABASE IF EXISTS test1;
|
|
--enable_warnings
|
|
CREATE DATABASE test1;
|
|
USE test;
|
|
|
|
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
|
|
}
|
|
USE test;
|
|
--source suite/funcs_1/include/sp_tb.inc
|