database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Up-merge of merges, some criss-cross resolved with --weave.

Browse Source
This commit is contained in:
Timothy Smith
2008-07-19 02:31:33 -06:00
parent e6f3e65a3a f44c3210ce
commit 6e8eaa8e21
6 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/funcs_1/triggers/triggers_03.inc
View File

@@ -13,6 +13,13 @@
USE test;
--source suite/funcs_1/include/tb3.inc
# This test cannot be used for the embedded server because we check here
# privilgeges.
--source include/not_embedded.inc
USE test;
--source suite/funcs_1/include/tb3.inc
--disable_abort_on_error
###########################################

3
mysql-test/suite/funcs_1/triggers/triggers_08.inc
View File

@@ -8,6 +8,9 @@
USE test;
--source suite/funcs_1/include/tb3.inc
USE test;
--source suite/funcs_1/include/tb3.inc
# General setup for Trigger tests
let $message= Testcase: 3.5:;
--source include/show_msg.inc

8
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
View File

@@ -13,6 +13,14 @@ eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
USE test;
--source suite/funcs_1/include/tb3.inc
--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
eval
load data infile '$MYSQLTEST_VARDIR/std_data_ln/funcs_1/memory_tb3.txt'
into table tb3;
--disable_abort_on_error
##############################################