mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Upmerge of fix for
Bug 36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
This commit is contained in:
@ -9,3 +9,5 @@
|
||||
# Don't use any TAB characters for whitespace.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
ndb_trig_1011ext: Bug#32656 NDB: Duplicate key error aborts transaction in handler. Doesn't talk back to SQL
|
@ -1,4 +1,4 @@
|
||||
#### suite/funcs_1/t/innodb_triggers.test
|
||||
#### suite/funcs_1/t/innodb_trig_0102.test
|
||||
|
||||
# InnoDB tables should be used
|
||||
#
|
||||
@ -7,10 +7,4 @@
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= innodb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/innodb_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_0102.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#### suite/funcs_1/t/innodb_triggers.test
|
||||
#### suite/funcs_1/t/innodb_trig_03.test
|
||||
|
||||
# InnoDB tables should be used
|
||||
#
|
||||
@ -7,10 +7,4 @@
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= innodb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/innodb_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_03.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#### suite/funcs_1/t/innodb_triggers.test
|
||||
#### suite/funcs_1/t/innodb_trig_0407.test
|
||||
|
||||
# InnoDB tables should be used
|
||||
#
|
||||
@ -7,10 +7,4 @@
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= innodb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/innodb_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_0407.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#### suite/funcs_1/t/innodb_triggers.test
|
||||
#### suite/funcs_1/t/innodb_trig_08.test
|
||||
|
||||
# InnoDB tables should be used
|
||||
#
|
||||
@ -7,10 +7,4 @@
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= innodb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/innodb_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_08.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#### suite/funcs_1/t/innodb_triggers.test
|
||||
#### suite/funcs_1/t/innodb_trig_09.test
|
||||
|
||||
# InnoDB tables should be used
|
||||
#
|
||||
@ -7,10 +7,4 @@
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= innodb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/innodb_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_09.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#### suite/funcs_1/t/innodb_triggers.test
|
||||
#### suite/funcs_1/t/innodb_trig_1011ext.test
|
||||
|
||||
# InnoDB tables should be used
|
||||
#
|
||||
@ -7,10 +7,4 @@
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= innodb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/innodb_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_1011ext.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/memory_triggers.test
|
||||
#### suite/funcs_1/t/memory_trig_0102.test
|
||||
|
||||
# Memory tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= memory;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/memory_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_0102.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/memory_triggers.test
|
||||
#### suite/funcs_1/t/memory_trig_03.test
|
||||
|
||||
# Memory tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= memory;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/memory_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_03.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/memory_triggers.test
|
||||
#### suite/funcs_1/t/memory_trig_0407.test
|
||||
|
||||
# Memory tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= memory;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/memory_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_0407.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/memory_triggers.test
|
||||
#### suite/funcs_1/t/memory_trig_08.test
|
||||
|
||||
# Memory tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= memory;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/memory_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_08.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/memory_triggers.test
|
||||
#### suite/funcs_1/t/memory_trig_09.test
|
||||
|
||||
# Memory tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= memory;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/memory_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_09.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/memory_triggers.test
|
||||
#### suite/funcs_1/t/memory_trig_1011ext.test
|
||||
|
||||
# Memory tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= memory;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/memory_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_1011ext.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/myisam_triggers.test
|
||||
#### suite/funcs_1/t/myisam_trig_0102.test
|
||||
|
||||
# MyISAM tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= myisam;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/myisam_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_0102.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/myisam_triggers.test
|
||||
#### suite/funcs_1/t/myisam_trig_03.test
|
||||
|
||||
# MyISAM tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= myisam;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/myisam_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_03.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/myisam_triggers.test
|
||||
#### suite/funcs_1/t/myisam_trig_0407.test
|
||||
|
||||
# MyISAM tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= myisam;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/myisam_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_0407.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/myisam_triggers.test
|
||||
#### suite/funcs_1/t/myisam_trig_08.test
|
||||
|
||||
# MyISAM tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= myisam;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/myisam_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_08.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/myisam_triggers.test
|
||||
#### suite/funcs_1/t/myisam_trig_09.test
|
||||
|
||||
# MyISAM tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= myisam;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/myisam_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_09.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,14 +1,8 @@
|
||||
#### suite/funcs_1/t/myisam_triggers.test
|
||||
#### suite/funcs_1/t/myisam_trig_1011ext.test
|
||||
|
||||
# MyISAM tables should be used
|
||||
#
|
||||
# Set $engine_type
|
||||
let $engine_type= myisam;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/myisam_tb3.inc
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_1011ext.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
@ -1,16 +1,10 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
#### suite/funcs_1/t/ndb_trig_0102.test
|
||||
|
||||
# ndb tables should be used
|
||||
# NDB tables should be used
|
||||
#
|
||||
# 1. Check if ndb is available
|
||||
# 1. Check if NDB is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/ndb_tb3.inc
|
||||
let $engine_type= ndbcluster;
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_0102.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
16
mysql-test/suite/funcs_1/t/ndb_trig_0102.test.moved
Normal file
16
mysql-test/suite/funcs_1/t/ndb_trig_0102.test.moved
Normal file
@ -0,0 +1,16 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
|
||||
# ndb tables should be used
|
||||
#
|
||||
# 1. Check if ndb is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# 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;
|
||||
|
@ -1,16 +1,10 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
#### suite/funcs_1/t/ndb_trig_03.test
|
||||
|
||||
# NDB tables should be used
|
||||
#
|
||||
# 1. Check if NDB is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/ndb_tb3.inc
|
||||
let $engine_type= ndbcluster;
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_03.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
16
mysql-test/suite/funcs_1/t/ndb_trig_03.test.moved
Normal file
16
mysql-test/suite/funcs_1/t/ndb_trig_03.test.moved
Normal file
@ -0,0 +1,16 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
|
||||
# NDB tables should be used
|
||||
#
|
||||
# 1. Check if NDB is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# 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;
|
||||
|
@ -1,16 +1,10 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
#### suite/funcs_1/t/ndb_trig_0407.test
|
||||
|
||||
# ndb tables should be used
|
||||
# NDB tables should be used
|
||||
#
|
||||
# 1. Check if ndb is available
|
||||
# 1. Check if NDB is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/ndb_tb3.inc
|
||||
let $engine_type= ndbcluster;
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_0407.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
16
mysql-test/suite/funcs_1/t/ndb_trig_0407.test.moved
Normal file
16
mysql-test/suite/funcs_1/t/ndb_trig_0407.test.moved
Normal file
@ -0,0 +1,16 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
|
||||
# ndb tables should be used
|
||||
#
|
||||
# 1. Check if ndb is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# 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;
|
||||
|
@ -1,16 +1,10 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
#### suite/funcs_1/t/ndb_trig_08.test
|
||||
|
||||
# ndb tables should be used
|
||||
# NDB tables should be used
|
||||
#
|
||||
# 1. Check if ndb is available
|
||||
# 1. Check if NDB is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/ndb_tb3.inc
|
||||
let $engine_type= ndbcluster;
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_08.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
16
mysql-test/suite/funcs_1/t/ndb_trig_08.test.moved
Normal file
16
mysql-test/suite/funcs_1/t/ndb_trig_08.test.moved
Normal file
@ -0,0 +1,16 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
|
||||
# ndb tables should be used
|
||||
#
|
||||
# 1. Check if ndb is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# 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;
|
||||
|
@ -1,16 +1,10 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
#### suite/funcs_1/t/ndb_trig_09.test
|
||||
|
||||
# ndb tables should be used
|
||||
# NDB tables should be used
|
||||
#
|
||||
# 1. Check if ndb is available
|
||||
# 1. Check if NDB is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/ndb_tb3.inc
|
||||
let $engine_type= ndbcluster;
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_09.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
16
mysql-test/suite/funcs_1/t/ndb_trig_09.test.moved
Normal file
16
mysql-test/suite/funcs_1/t/ndb_trig_09.test.moved
Normal file
@ -0,0 +1,16 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
|
||||
# ndb tables should be used
|
||||
#
|
||||
# 1. Check if ndb is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# 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;
|
||||
|
@ -1,16 +1,10 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
#### suite/funcs_1/t/ndb_trig_1011ext.test
|
||||
|
||||
# ndb tables should be used
|
||||
# NDB tables should be used
|
||||
#
|
||||
# 1. Check if ndb is available
|
||||
# 1. Check if NDB is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# Create some objects needed in many testcases
|
||||
USE test;
|
||||
--source suite/funcs_1/include/ndb_tb3.inc
|
||||
let $engine_type= ndbcluster;
|
||||
|
||||
--source suite/funcs_1/triggers/triggers_1011ext.inc
|
||||
DROP TABLE test.tb3;
|
||||
|
||||
|
16
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test.moved
Normal file
16
mysql-test/suite/funcs_1/t/ndb_trig_1011ext.test.moved
Normal file
@ -0,0 +1,16 @@
|
||||
#### suite/funcs_1/t/ndb_triggers.test
|
||||
|
||||
# ndb tables should be used
|
||||
#
|
||||
# 1. Check if ndb is available
|
||||
--source include/have_ndb.inc
|
||||
# 2. Set $engine_type
|
||||
let $engine_type= ndb;
|
||||
|
||||
# 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;
|
||||
|
Reference in New Issue
Block a user