MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Luís Soares Date:February 5 2010 5:45pm
Subject:Re: bzr commit into mysql-6.0-codebase branch (Serge.Kozlov:3865)
Bug#48308
View as plain text  
Hi,

On Fri, 2010-02-05 at 19:09 +0200, Andrei Elkin wrote:
> Once again Luis won race, so I am following up his mail.

Yuppii! Ehehe

> All in all, the patch is very good to base on a good platform.

I agree. So that's why I think that it one of the reasons I 
think it should go into next-mr...

> > Hi Serge, 
> >
> >   I have only one suggestion more. Why not make clean_up_fake_... to
> > remove the left over relay info file as well? Something like: 
> >
> > === modified file 'mysql-test/include/cleanup_fake_relay_log.inc'
> > --- mysql-test/include/cleanup_fake_relay_log.inc	2008-12-29 16:04:10
> > +0000
> > +++ mysql-test/include/cleanup_fake_relay_log.inc	2010-02-05 15:38:34
> > +0000
> > @@ -11,6 +11,13 @@
> >  # Remove files.
> >  remove_file $_fake_relay_log;
> >  remove_file $_fake_relay_index;
> > +
> > +# Get relay info file
> > +let $_relay_log_info_file= query_get_value(SHOW GLOBAL VARIABLES LIKE
> > 'relay_log_info_file', Value, 1);
> > +# Remove relay info file if it exists
> > +error 0,1;
> > +remove_file $MYSQLD_DATADIR/$_relay_log_info_file;
> > +
> >  --disable_query_log
> >  eval SET @@global.relay_log_purge= $_fake_relay_log_purge;
> >  --enable_query_log
> 
> I spoke to Luis to explain that deletion of the relay info is not really a 
> requirement for these fixes. The setup relay log is not worse nor better than
> a native one. And it is supposed to be wiped away by a following test's
> master-slave-reset or the same  setup_fake_relay_log which the patch made
> to delete the info.
> 
> I would not strongly object though if you follow Luis' suggestion.
> However, could you please notice that 
> RESET SLAVE provides nicer wipe-out of the relay-log info than --remove_file,
> and therefore to convert the patch to call RESET SLAVE.

Hmm... I had suggested that in some previous discussion (although 
still in the context of the initial proposal). However, Serge 
argued that reset slave would recreated all files [1]. Anyway, if
RESET SLAVE fits, I am all for it.

And Andrei, always a pleasure to "race" with (and *not against*) you... 

Best Regards,
Luís

[1]
https://intranet.mysql.com/secure/apps/irclog.php?channel=22&start_time=2010-02-04+17%3A08%3A55+&end_time=2010-02-04+17%3A17%3A53+%09

> cheers,
> 
> Andrei
> 
> >
> >
> >   Other than that, patch approved.
> >
> > Regards,
> > Luís 
> >
> >
> > On Fri, 2010-02-05 at 15:33 +0300, Serge Kozlov wrote:
> >> #At file:///home/ksm/sun/repo/bug48308/commit-6.0-cbbf/ based on
> revid:alik@stripped
> >> 
> >>  3865 Serge Kozlov	2010-02-05
> >>       Bug#48308.
> >>       1. Now test use fake_relay_log primitive
> >>       2. include/setup_fake_relay_log.inc removes relay log info file if it
> exists
> >>       3. Test moved to rpl suite as rpl_binlog_auto_inc_bug33029.test
> >>       4. Updated result file
> >>       renamed:
> >>         mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result
> => mysql-test/suite/rpl/r/rpl_binlog_auto_inc_bug33029.result
> >>         mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt
> => mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029-master.opt
> >>         mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test =>
> mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029.test
> >>       modified:
> >>         mysql-test/include/setup_fake_relay_log.inc
> >>         mysql-test/suite/rpl/r/rpl_binlog_auto_inc_bug33029.result
> >>         mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029.test
> >> 
> >> === modified file 'mysql-test/include/setup_fake_relay_log.inc'
> >> --- a/mysql-test/include/setup_fake_relay_log.inc	2009-10-26 14:02:26 +0000
> >> +++ b/mysql-test/include/setup_fake_relay_log.inc	2010-02-05 12:33:19 +0000
> >> @@ -70,6 +70,12 @@ let $_fake_relay_log_purge= `SELECT @@gl
> >>  copy_file $fake_relay_log $_fake_relay_log;
> >>  # Create relay log index.
> >>  
> >> +# Get relay info file
> >> +let $_relay_log_info_file= query_get_value(SHOW GLOBAL VARIABLES LIKE
> 'relay_log_info_file', Value, 1);
> >> +# Remove relay info file if it exists
> >> +error 0,1;
> >> +remove_file $MYSQLD_DATADIR/$_relay_log_info_file;
> >> +
> >>  # After patch for BUG#12190, the filename used in CHANGE MASTER
> >>  # RELAY_LOG_FILE will be automatically added the directory of the
> >>  # relay log before comparison, thus we need to added the directory
> >> 
> >> === renamed file
> 'mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result' =>
> 'mysql-test/suite/rpl/r/rpl_binlog_auto_inc_bug33029.result'
> >> ---
> a/mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result	2009-03-06 18:19:29
> +0000
> >> +++ b/mysql-test/suite/rpl/r/rpl_binlog_auto_inc_bug33029.result	2010-02-05
> 12:33:19 +0000
> >> @@ -1,8 +1,4 @@
> >> -SET @old_relay_log_purge= @@global.relay_log_purge;
> >> -change master to
> >> -MASTER_HOST='dummy.localdomain',
> >> -RELAY_LOG_FILE='slave-relay-bin.000001',
> >> -RELAY_LOG_POS=4;
> >> +Setting up fake replication from
> MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001
> >>  start slave sql_thread;
> >>  select MASTER_POS_WAIT('master-bin.000001', 3776);
> >>  # Result on slave
> >> @@ -38,5 +34,4 @@ DROP PROCEDURE IF EXISTS p2;
> >>  DROP FUNCTION IF EXISTS f1;
> >>  DROP TRIGGER IF EXISTS tr1;
> >>  stop slave sql_thread;
> >> -reset slave;
> >> -SET @@global.relay_log_purge= @old_relay_log_purge;
> >> +Cleaning up after setup_fake_relay_log.inc
> >> 
> >> === renamed file
> 'mysql-test/suite/binlog/t/binlog_auto_increment_bug33029-master.opt' =>
> 'mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029-master.opt'
> >> === renamed file
> 'mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test' =>
> 'mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029.test'
> >> ---
> a/mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test	2009-10-26 14:02:26 +0000
> >> +++ b/mysql-test/suite/rpl/t/rpl_binlog_auto_inc_bug33029.test	2010-02-05
> 12:33:19 +0000
> >> @@ -17,35 +17,8 @@
> >>  
> >>  source include/have_log_bin.inc;
> >>  
> >> -# Need to restore this at the end; CHANGE MASTER modifies it (see the
> >> -# manual for CHANGE MASTER).
> >> -SET @old_relay_log_purge= @@global.relay_log_purge;
> >> -
> >> -let $MYSQLD_DATADIR= `select @@datadir`;
> >> -
> >> -copy_file $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001
> $MYSQLD_DATADIR/slave-relay-bin.000001;
> >> -
> >> -
> >> -# After patch for BUG#12190, the filename used in CHANGE MASTER
> >> -# RELAY_LOG_FILE will be automatically added the directory of the
> >> -# relay log before comparison, thus we need to added the directory
> >> -# part (./ on unix .\ on windows) when faking the relay-log-bin.index.
> >> -disable_query_log;
> >> -if (`select convert(@@version_compile_os using latin1) IN
> ("Win32","Win64","Windows") = 0`)
> >> -{
> >> -  eval select './slave-relay-bin.000001\n' into dumpfile
> '$MYSQLD_DATADIR/slave-relay-bin.index';
> >> -}
> >> -
> >> -if (`select convert(@@version_compile_os using latin1) IN
> ("Win32","Win64","Windows") != 0`)
> >> -{
> >> -  eval select '.\\\\slave-relay-bin.000001\n' into dumpfile
> '$MYSQLD_DATADIR/slave-relay-bin.index';
> >> -}
> >> -enable_query_log;
> >> -
> >> -change master to
> >> -  MASTER_HOST='dummy.localdomain',
> >> -  RELAY_LOG_FILE='slave-relay-bin.000001',
> >> -  RELAY_LOG_POS=4;
> >> +let $fake_relay_log=
> $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001;
> >> +source include/setup_fake_relay_log.inc;
> >>  
> >>  start slave sql_thread;
> >>  disable_result_log;
> >> @@ -66,9 +39,4 @@ DROP TRIGGER IF EXISTS tr1;
> >>  enable_warnings;
> >>  
> >>  stop slave sql_thread;
> >> -reset slave;
> >> -source include/wait_for_slave_sql_to_stop.inc;
> >> -remove_file $MYSQLD_DATADIR/slave-relay-bin.000001;
> >> -remove_file $MYSQLD_DATADIR/slave-relay-bin.index;
> >> -
> >> -SET @@global.relay_log_purge= @old_relay_log_purge;
> >> +source include/cleanup_fake_relay_log.inc;


Thread
bzr commit into mysql-6.0-codebase branch (Serge.Kozlov:3865) Bug#48308Serge Kozlov5 Feb
  • Re: bzr commit into mysql-6.0-codebase branch (Serge.Kozlov:3865)Bug#48308Luís Soares5 Feb
    • Re: bzr commit into mysql-6.0-codebase branch (Serge.Kozlov:3865)Bug#48308Luís Soares5 Feb
Re: bzr commit into mysql-6.0-codebase branch (Serge.Kozlov:3865)Bug#48308Luís Soares5 Feb
Re: bzr commit into mysql-6.0-codebase branch (Serge.Kozlov:3865)Bug#48308Serge Kozlov5 Feb
Re: bzr commit into mysql-6.0-codebase branch (Serge.Kozlov:3865)Bug#48308Serge Kozlov8 Feb