database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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.1-build-work-nn


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/include/federated.inc:
  Auto merged
This commit is contained in:
unknown
2007-05-15 11:33:19 +02:00
parent 4e33ca3184 adeaeb5025
commit 8b3c85b824
3 changed files with 3 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/have_federated_db.inc

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

@ -3782,8 +3782,7 @@ sub mysqld_arguments ($$$$) {
"%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
# 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 (! ($opt_skip_master_binlog || $skip_binlog) )

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

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