database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn

Browse Source 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown
2007-05-30 17:09:41 +02:00
parent 0629727088 c317bc08cd
commit 001c930a9b
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/include/federated.inc
View File

@@ -1,3 +1,4 @@
--source include/have_log_bin.inc
--source include/not_embedded.inc --source include/not_embedded.inc
--source ./include/have_federated_db.inc --source ./include/have_federated_db.inc

3
mysql-test/mysql-test-run.pl
View File

@@ -3740,8 +3740,7 @@ sub mysqld_arguments ($$$$) {
"%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path); "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
# Check if "extra_opt" contains --skip-log-bin # Check if "extra_opt" contains --skip-log-bin
my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt); my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
if ( $mysqld->{'type'} eq 'master' ) if ( $mysqld->{'type'} eq 'master' )
{ {
if (! ($opt_skip_master_binlog || $skip_binlog) ) if (! ($opt_skip_master_binlog || $skip_binlog) )

2
mysql-test/r/have_log_bin.require
View File

@@ -1,2 +1,2 @@
Variable_name Value Variable_name Value
have_log_bin ON log_bin ON

3
mysql-test/t/mysqldump.test
View File

@@ -1,6 +1,9 @@
# Embedded server doesn't support external clients # Embedded server doesn't support external clients
--source include/not_embedded.inc --source include/not_embedded.inc
# Binlog is required
--source include/have_log_bin.inc
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3; DROP TABLE IF EXISTS t1, `"t"1`, t1aa, t2, t2aa, t3;
drop database if exists mysqldump_test_db; drop database if exists mysqldump_test_db;