Commit d7e6ba47 authored by mleich@five.local.lan's avatar mleich@five.local.lan
Browse files

Post fix for

WL#4203 Reorganize and fix the data dictionary tests of
        testsuite funcs_1
because the goal to fix
Bug#34532 Some funcs_1 tests do not clean up at end of testing
was partially missed.
Some minor additional modifications are for
   WL#4304 Cleanup in funcs_1 tests
parent 3f6e20a0
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
#### suite/funcs_1/cursors/cursors_master.test

let $message= NOT YET IMPLEMENTED: cursor tests;
--source include/show_msg80.inc
+33 −49
Original line number Diff line number Diff line
@@ -67,27 +67,12 @@ let $engine_myisam= `SELECT @ENGINE_MYISAM = 1`;
let $engine_innodb= `SELECT @ENGINE_INNODB = 1`;
let $engine_memory= `SELECT @ENGINE_MEMORY = 1`;

# 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
@@ -119,4 +104,3 @@ if ($run)
}
USE test;
--source suite/funcs_1/include/sp_tb.inc
}
+0 −0

File mode changed from 100755 to 100644.

+0 −0

File mode changed from 100755 to 100644.

+0 −0

File mode changed from 100755 to 100644.

Loading