database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Post merge fix for

Browse Source 
ChangeSet@1.2565, 2008-03-11 20:20:49+01:00
     Merge five.local.lan:/work/merge/mysql-5.0-funcs_1
     into  five.local.lan:/work/merge/mysql-5.1-funcs_1
     MERGE: 1.1810.3473.26

   ChangeSet@1.1810.3473.26, 2008-03-11 19:54:35+01:00
   Post fix for
   WL#4203 Reorganize and fix the data dictionary tests of
           testsuite funcs_1

The final fix of
Bug#34532 Some funcs_1 tests do not clean up at end of testing
   and some minor additional modifications are for
happens here
This commit is contained in:
mleich@five.local.lan
2008-03-12 12:56:07 +01:00
parent 365c29243d
commit 68e548df3d
31 changed files with 64 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mysql-test/suite/funcs_1/t/innodb_trig_03e.test
View File

@ -7,24 +7,9 @@
# 2. Set $engine_type
let $engine_type= innodb;
# 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.
# Create some objects needed in many testcases
USE test;
eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
let $run= `SELECT @NO_REFRESH = 0`;
if ($run)
{
# Create some objects needed in many testcases
USE test;
}
--source suite/funcs_1/triggers/triggers_03e_db_level.inc
--source suite/funcs_1/triggers/triggers_03e_table_level.inc
--source suite/funcs_1/triggers/triggers_03e_global_db_mix.inc
@ -34,5 +19,3 @@ if ($run)
--source suite/funcs_1/triggers/triggers_03e_transaction.inc
--source suite/funcs_1/triggers/triggers_03e_columns.inc

22
mysql-test/suite/funcs_1/t/memory_trig_03e.test
View File

@ -5,23 +5,8 @@
# Set $engine_type
let $engine_type= memory;
# 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)
{
# Create some objects needed in many testcases
USE test;
}
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/triggers/triggers_03e_db_level.inc
--source suite/funcs_1/triggers/triggers_03e_table_level.inc
@ -31,6 +16,3 @@ if ($run)
--source suite/funcs_1/triggers/triggers_03e_definer.inc
--source suite/funcs_1/triggers/triggers_03e_columns.inc

23
mysql-test/suite/funcs_1/t/myisam_trig_03e.test
View File

@ -5,23 +5,8 @@
# Set $engine_type
let $engine_type= myisam;
# 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)
{
# Create some objects needed in many testcases
USE test;
}
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/triggers/triggers_03e_db_level.inc
--source suite/funcs_1/triggers/triggers_03e_table_level.inc
@ -31,7 +16,3 @@ if ($run)
--source suite/funcs_1/triggers/triggers_03e_definer.inc
--source suite/funcs_1/triggers/triggers_03e_columns.inc

9
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
View File

@ -5,15 +5,6 @@
# Set $engine_type
let $engine_type= myisam;
# 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.
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/myisam_tb3.inc

24
mysql-test/suite/funcs_1/t/ndb_bitdata.test
View File

@ -7,24 +7,12 @@
# 2. Set $engine_type
let $engine_type= ndb;
# 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.
let $message= NOT YET IMPLEMENTED: bitdata tests;
--source include/show_msg80.inc
exit;
eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb4.inc
let $run= `SELECT @NO_REFRESH = 0`;
if ($run)
{
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb4.inc
}
--source suite/funcs_1/bitdata/bitdata_master.test

23
mysql-test/suite/funcs_1/t/ndb_cursors.test
View File

@ -7,24 +7,13 @@
# 2. Set $engine_type
let $engine_type= ndb;
# 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.
let $message= NOT YET IMPLEMENTED: cursor tests;
--source include/show_msg80.inc
exit;
eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
let $run= `SELECT @NO_REFRESH = 0`;
if ($run)
{
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb1.inc
}
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb1.inc
--source suite/funcs_1/cursors/cursors_master.test

22
mysql-test/suite/funcs_1/t/ndb_trig_0102.test
View File

@ -7,24 +7,10 @@
# 2. Set $engine_type
let $engine_type= ndb;
# 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.
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
let $run= `SELECT @NO_REFRESH = 0`;
if ($run)
{
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
}
--source suite/funcs_1/triggers/triggers_0102.inc
DROP TABLE test.tb3;

22
mysql-test/suite/funcs_1/t/ndb_trig_03.test
View File

@ -7,24 +7,10 @@
# 2. Set $engine_type
let $engine_type= ndb;
# 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)
{
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
}
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
--source suite/funcs_1/triggers/triggers_03.inc
DROP TABLE test.tb3;

22
mysql-test/suite/funcs_1/t/ndb_trig_03e.test
View File

@ -7,24 +7,9 @@
# 2. Set $engine_type
let $engine_type= ndb;
# 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.
# Create some objects needed in many testcases
USE test;
eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
let $run= `SELECT @NO_REFRESH = 0`;
if ($run)
{
# Create some objects needed in many testcases
USE test;
}
--source suite/funcs_1/triggers/triggers_03e_db_level.inc
--source suite/funcs_1/triggers/triggers_03e_table_level.inc
--source suite/funcs_1/triggers/triggers_03e_global_db_mix.inc
@ -34,6 +19,3 @@ if ($run)
--source suite/funcs_1/triggers/triggers_03e_transaction.inc
--source suite/funcs_1/triggers/triggers_03e_columns.inc

22
mysql-test/suite/funcs_1/t/ndb_trig_0407.test
View File

@ -7,24 +7,10 @@
# 2. Set $engine_type
let $engine_type= ndb;
# 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.
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
let $run= `SELECT @NO_REFRESH = 0`;
if ($run)
{
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
}
--source suite/funcs_1/triggers/triggers_0407.inc
DROP TABLE test.tb3;

22
mysql-test/suite/funcs_1/t/ndb_trig_08.test
View File

@ -7,24 +7,10 @@
# 2. Set $engine_type
let $engine_type= ndb;
# 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)
{
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
}
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
--source suite/funcs_1/triggers/triggers_08.inc
DROP TABLE test.tb3;

22
mysql-test/suite/funcs_1/t/ndb_trig_09.test
View File

@ -7,24 +7,10 @@
# 2. Set $engine_type
let $engine_type= ndb;
# 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.
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
let $run= `SELECT @NO_REFRESH = 0`;
if ($run)
{
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
}
--source suite/funcs_1/triggers/triggers_09.inc
DROP TABLE test.tb3;

22
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test
View File

@ -7,24 +7,10 @@
# 2. Set $engine_type
let $engine_type= ndb;
# 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.
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
eval SET @NO_REFRESH = IF( '$NO_REFRESH' = '', 0, 1);
let $run= `SELECT @NO_REFRESH = 0`;
if ($run)
{
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb3.inc
}
--source suite/funcs_1/triggers/triggers_1011ext.inc
DROP TABLE test.tb3;

44
mysql-test/suite/funcs_1/t/ndb_views.test
View File

@ -7,38 +7,18 @@
# 2. Set $engine_type
let $engine_type= ndb;
# 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)
{
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb2.inc
--disable_warnings
DROP DATABASE IF EXISTS test1;
--enable_warnings
CREATE DATABASE test1;
USE test1;
--source suite/funcs_1/include/ndb_tb2.inc
USE test;
}
# Create some objects needed in many testcases
USE test;
--source suite/funcs_1/include/ndb_tb2.inc
--disable_warnings
DROP DATABASE IF EXISTS test1;
--enable_warnings
CREATE DATABASE test1;
USE test1;
--source suite/funcs_1/include/ndb_tb2.inc
USE test;
--source suite/funcs_1/views/views_master.inc
# If we created the database in the above loop we now need to drop it
let $run= `SELECT @NO_REFRESH = 0`;
if ($run)
{
DROP DATABASE IF EXISTS test1;
}
DROP DATABASE test1;
DROP TABLE test.tb2;