1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post fix for

Browse Source 
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


BitKeeper/deleted/.del-innodb_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/innodb_triggers.result -> BitKeeper/deleted/.del-innodb_triggers.result
BitKeeper/deleted/.del-memory_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/memory_triggers.result -> BitKeeper/deleted/.del-memory_triggers.result
BitKeeper/deleted/.del-myisam_triggers.result:
  Rename: mysql-test/suite/funcs_1/r/myisam_triggers.result -> BitKeeper/deleted/.del-myisam_triggers.result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  Cleanup
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_memory.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
  Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
  Cleanup
mysql-test/suite/funcs_1/views/views_master.inc:
  Backport of file in 5.1 which got many fixes for instabilities
  and other improvements
This commit is contained in:
unknown 2008-03-11 19:54:35 +01:00
parent f7ffb05063
commit 67d529ed3b
36 changed files with 38051 additions and 8866 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/funcs_1/cursors/cursors_master.test
View File

@ -1,4 +1,3 @@
#### suite/funcs_1/cursors/cursors_master.test
let $message= NOT YET IMPLEMENTED: cursor tests;
--source include/show_msg80.inc

86
mysql-test/suite/funcs_1/datadict/datadict_load.inc
View File

@ -67,56 +67,40 @@ 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;
if ($engine_innodb)
{
--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
}
USE test;
--source suite/funcs_1/include/sp_tb.inc
--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

0
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result Executable file → Normal file
View File

2331
mysql-test/suite/funcs_1/r/innodb_triggers.result
View File

File diff suppressed because it is too large Load Diff

12478
mysql-test/suite/funcs_1/r/innodb_views.result
View File

File diff suppressed because it is too large Load Diff

1
mysql-test/suite/funcs_1/r/is_columns_innodb.result
View File

@ -1,4 +1,3 @@
SET @NO_REFRESH = IF( '' = '', 0, 1);
DROP DATABASE IF EXISTS test1;
CREATE DATABASE test1;
USE test;

1
mysql-test/suite/funcs_1/r/is_columns_memory.result
View File

@ -1,5 +1,4 @@
SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
SET @NO_REFRESH = IF( '' = '', 0, 1);
DROP DATABASE IF EXISTS test1;
CREATE DATABASE test1;
USE test;

1
mysql-test/suite/funcs_1/r/is_columns_myisam.result
View File

@ -1,5 +1,4 @@
SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
SET @NO_REFRESH = IF( '' = '', 0, 1);
DROP DATABASE IF EXISTS test1;
CREATE DATABASE test1;
USE test;

1
mysql-test/suite/funcs_1/r/is_columns_ndb.result
View File

@ -1,4 +1,3 @@
SET @NO_REFRESH = IF( '' = '', 0, 1);
DROP DATABASE IF EXISTS test1;
CREATE DATABASE test1;
USE test;

1
mysql-test/suite/funcs_1/r/is_tables_innodb.result
View File

@ -1,4 +1,3 @@
SET @NO_REFRESH = IF( '' = '', 0, 1);
DROP DATABASE IF EXISTS test1;
CREATE DATABASE test1;
USE test;

1
mysql-test/suite/funcs_1/r/is_tables_memory.result
View File

@ -1,5 +1,4 @@
SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
SET @NO_REFRESH = IF( '' = '', 0, 1);
DROP DATABASE IF EXISTS test1;
CREATE DATABASE test1;
USE test;

1
mysql-test/suite/funcs_1/r/is_tables_myisam.result
View File

@ -1,5 +1,4 @@
SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
SET @NO_REFRESH = IF( '' = '', 0, 1);
DROP DATABASE IF EXISTS test1;
CREATE DATABASE test1;
USE test;

1
mysql-test/suite/funcs_1/r/is_tables_ndb.result
View File

@ -1,4 +1,3 @@
SET @NO_REFRESH = IF( '' = '', 0, 1);
DROP DATABASE IF EXISTS test1;
CREATE DATABASE test1;
USE test;

0
mysql-test/suite/funcs_1/r/memory_storedproc_02.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/memory_storedproc_03.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/memory_storedproc_07.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/memory_storedproc_08.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/memory_storedproc_10.result Executable file → Normal file
View File

2262
mysql-test/suite/funcs_1/r/memory_triggers.result
View File

File diff suppressed because it is too large Load Diff

12478
mysql-test/suite/funcs_1/r/memory_views.result
View File

File diff suppressed because it is too large Load Diff

0
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result Executable file → Normal file
View File

0
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result Executable file → Normal file
View File

2266
mysql-test/suite/funcs_1/r/myisam_triggers.result
View File

File diff suppressed because it is too large Load Diff

14142
mysql-test/suite/funcs_1/r/myisam_views.result
View File

File diff suppressed because it is too large Load Diff

3
mysql-test/suite/funcs_1/t/innodb_storedproc.test
View File

@ -1,6 +1,9 @@
#### suite/funcs_1/t/innodb_storedproc.test
#
--source include/have_innodb.inc
let $engine_type= innodb;
--source suite/funcs_1/storedproc/load_sp_tb.inc
--source suite/funcs_1/storedproc/storedproc_master.inc

2
mysql-test/suite/funcs_1/t/memory_storedproc.test
View File

@ -3,4 +3,6 @@
let $engine_type= memory;
--source suite/funcs_1/storedproc/load_sp_tb.inc
--source suite/funcs_1/storedproc/storedproc_master.inc

2
mysql-test/suite/funcs_1/t/myisam_storedproc.test
View File

@ -3,4 +3,6 @@
let $engine_type= myisam;
--source suite/funcs_1/storedproc/load_sp_tb.inc
--source suite/funcs_1/storedproc/storedproc_master.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

849
mysql-test/suite/funcs_1/views/views_master.inc
View File

File diff suppressed because it is too large Load Diff