Commit 6e8eaa8e authored by Timothy Smith's avatar Timothy Smith
Browse files

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

parents e6f3e65a f44c3210

mysql-test/suite/funcs_1/triggers/triggers_03.inc

+7 −0
Original line number Diff line number Diff line
@@ -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



###########################################

mysql-test/suite/funcs_1/triggers/triggers_08.inc

+3 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc

+8 −0
Original line number Diff line number Diff line
@@ -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



##############################################

support-files/my-huge.cnf.sh

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ thread_concurrency = 8 
# 

#skip-networking



# Disable Federated by default

skip-federated



# Replication Master Server (default)

# binary logging is required for replication

log-bin=mysql-bin

support-files/my-large.cnf.sh

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ thread_concurrency = 8 
# 

#skip-networking



# Disable Federated by default

skip-federated



# Replication Master Server (default)

# binary logging is required for replication

log-bin=mysql-bin