List:Commits« Previous MessageNext Message »
From:anders Date:January 13 2011 9:32am
Subject:Re: bzr commit into mysql-trunk branch (daogang.qu:3214) WL#5493
View as plain text  
On Thu, 2011-01-13 at 13:18 +0800, Daogang Qu wrote:
> Hi Libing,
> Thanks for your comments. Addressed.
> Please review:
> http://lists.mysql.com/commits/128580
Hi daogang, It is not a patch in the url.
> 
> Best Regards,
> 
> Daogang
> 
> 2011-01-13 11:39, anders wrote:
> > Hi Daogang,
> >
> >
> >    
> >> === modified file
> 'mysql-test/suite/rpl/t/rpl_manual_change_index_file.test'
> >> --- a/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test	2010-12-19
> 17:22:30 +0000
> >> +++ b/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test	2011-01-12
> 10:38:40 +0000
> >> @@ -1,3 +1,4 @@
> >> +source include/not_windows.inc;
> >>   source include/master-slave.inc;
> >>
> >>   #
> >> @@ -113,91 +114,44 @@ sync_slave_with_master;
> >>   --echo # I/O thread stops immediately.
> >>
> >>   --source include/rpl_reset.inc
> >> ---echo [ on master ]
> >>      
> > Please don't remove this comment, it makes result file more clear.
> >    
> >>   connection master;
> >>
> >> -let $MASTER_DATADIR= `SELECT @@DATADIR`;
> >> -
> >>   call mtr.add_suppression("Got fatal error 1236 from master when reading
> data from binary log:");
> >> +let $MASTER_DATADIR= `SELECT @@DATADIR`;
> >>   CREATE TABLE t1(c1 int);
> >>   DROP TABLE t1;
> >>
> >>   FLUSH LOGS;
> >> -FLUSH LOGS;
> >>
> >>   CREATE TABLE t2(c1 int);
> >>   DROP TABLE t2;
> >>   sync_slave_with_master;
> >>
> >> ---echo [ on slave ]
> >>      
> > Please keep this comment, it makes result file more clear.
> >    
> >>   source include/stop_slave.inc;
> >> +source include/wait_for_slave_to_stop.inc;
> >>
> >>      
> > Please remove above line, it is not needed.
> >    
> >> ---echo [ on master ]
> >>      
> > Please keep remove this comment, it makes result file more clear.
> >    
> >>   connection master;
> >> ---echo # Remove master-bin.000001 and master-bin.000002 from index file.
> >> -PURGE MASTER LOGS TO 'master-bin.000003';
> >> -
> >> ---echo # Re-insert master-bin.000002 into index file manually.
> >> -if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) NOT IN ('Win32',
> 'Win64', 'Windows')`)
> >> -{
> >> -append_file $MASTER_DATADIR/master-bin.index;
> >> -./master-bin.000002
> >> -EOF
> >> -sleep 0.00000001;
> >> -}
> >> -if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) IN ('Win32',
> 'Win64', 'Windows')`)
> >> -{
> >> -append_file $MASTER_DATADIR/master-bin.index;
> >> -.\master-bin.000002
> >> -EOF
> >> -sleep 0.00000001;
> >> -}
> >> ---echo # PURGE is used to update IO_CACHE of index file.  After this
> statement,
> >> ---echo # master knows that master-bin.000002 is in index file.
> >> -PURGE MASTER LOGS TO 'master-bin.000002';
> >> +# This operation will result in error EE_FILENOTFOUND which happens
> >> +# when slave IO thread is connecting to master.
> >> +move_file $MASTER_DATADIR/master-bin.000001
> $MASTER_DATADIR/master-bin.bak;
> >>
> >> ---echo [ on slave ]
> >>      
> > Please keep this comment, it makes result file more clear.
> >    
> >>   connection slave;
> >> -CHANGE MASTER TO master_host='127.0.0.1',
> master_log_file='master-bin.000002';
> >> +CHANGE MASTER TO master_host='127.0.0.1',
> master_log_file='master-bin.000001';
> >>   START SLAVE IO_THREAD;
> >> -
> >> ---echo # Instead of EE_FILENOTFOUND, ER_MASTER_FATAL_ERROR_READING_BINLOG
> and the
> >> ---echo # specific information are sent to slave.
> >> +# Instead of EE_FILENOTFOUND, ER_MASTER_FATAL_ERROR_READING_BINLOG and the
> >> +# specific information are sent to slave.
> >>      
> > Please keep the comments in result file.
> >    
> >>   let $slave_io_errno= 1236;
> >> -let $show_slave_io_error= 1;
> >>      
> > Please keep to print error message into result file.
> >    
> >>   source include/wait_for_slave_io_error.inc;
> >>
> >> -CHANGE MASTER TO master_host='127.0.0.1',
> master_log_file='master-bin.000003';
> >> -source include/start_slave.inc;
> >> -
> >> -
> >> ---echo [ on master ]
> >>      
> > Please keep this comment, it makes result file more clear.
> >    
> >>   connection master;
> >> ---echo # Restore the correct index file.
> >> -let $file= $MASTER_DATADIR/master-bin.index;
> >> -source include/truncate_file.inc;
> >> -if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) NOT IN ('Win32',
> 'Win64', 'Windows')`)
> >> -{
> >> -append_file $MASTER_DATADIR/master-bin.index;
> >> -./master-bin.000003
> >> -EOF
> >> -sleep 0.00000001;
> >> -}
> >> -if (`SELECT CONVERT(@@VERSION_COMPILE_OS USING latin1) IN ('Win32',
> 'Win64', 'Windows')`)
> >> -{
> >> -append_file $MASTER_DATADIR/master-bin.index;
> >> -.\master-bin.000003
> >> -EOF
> >> -sleep 0.00000001;
> >> -}
> >> -FLUSH LOGS;
> >> -PURGE MASTER LOGS TO 'master-bin.000004';
> >> +# This operation will result in error EE_FILENOTFOUND which happens
> >> +# when slave IO thread is connecting to master.
> >>      
> >    
> >> +move_file $MASTER_DATADIR/master-bin.bak
> $MASTER_DATADIR/master-bin.000001;
> >>
> >>      
> > [snip]
> >    
> >> -CREATE TABLE t1(c1 INT);
> >> -sync_slave_with_master;
> >> ---echo [ on slave ]
> >> -SELECT * FROM t1;
> >>      
> > Please keep above code. It intents to verify replication is working
> > well.
> >    
> >> +connection slave;
> >> +CHANGE MASTER TO master_host='127.0.0.1',
> master_log_file='master-bin.000002';
> >> +source include/start_slave.inc;
> >>      
> > [snip]
> >    
> >> +source include/wait_for_slave_to_start.inc;
> >>      
> > It is not needed.
> >
> >    
> >> -connection master;
> >> -DROP TABLE t1;
> >>   --source include/rpl_end.inc
> >> +
> >>
> >> text/bzr-bundle type attachment
> >> (bzr/daogang.qu@stripped)
> >> # Bazaar merge directive format 2 (Bazaar 0.90)
> >> # revision_id: daogang.qu@stripped\
> >> #   b8e5wtas3o1yghi9
> >> # target_branch: file:///home/daogang/bzrwork/mysql-trunk-wl5493/
> >> # testament_sha1: b62bc6bb47ce55834e30feed9344665c64f1c9ae
> >> # timestamp: 2011-01-12 18:38:43 +0800
> >> # source_branch: file:///home/daogang/bzrroot/mysql-trunk/
> >> # base_revision_id: daogang.qu@stripped\
> >> #   1cia9i7n2u3yc2xq
> >> #
> >> # Begin bundle
> >>
> IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZGuQ/IAA2xfgGAQXOf//3/n
> >>
> 34q////wYAhOK33QaVFXdWInbChIUdA4SSJoAphqMZAKeFMg00DTyGo0ZGjJoEoieoYmkeiaCnpP
> >>
> I1NA9QaAA0AADQ4aaZGIwmmAhgE0wjBMTIaZGhoBiEINUaemoRgGhBoaA0wEaaPUwmQOGmmRiMJp
> >>
> gIYBNMIwTEyGmRoaASRBNAmjTQCaZMUn6R6mqbU9J6hptTQAMmjfcRdtI9+J+ZiJq2dciN8XdMZS
> >>
> jHjtaS54Eqy8TrGqk3Qdgxqp3u7opDRjQcwllYGA82d5JkQ1jSro5KXjbpapnsTZt9tgZRekiCkA
> >>
> M/YBgsaVT4YxIIPB77hQLFeh27xDWY2ubqPfE0RfSxM4E7mDq2wVD3O58Jx6dROx99nGHPrZPxdT
> >>
> b1AkMEp8PPTZZCLwNtwhCQz4ISl3C4sIH9sG9FzV/Y3R3Ck6FjlyykYraFgOEN1psSlnOQImN+Rl
> >>
> WWJIuiVJFmGXU8YGZ5YtZM0lsWmPMrPvIUJ+7qnPPLn2KVd+6I/N0HvF/FfMPlXmUabmaA9XQd7L
> >>
> K65146xhp1MLShcZiYBkny3Mhz7Jt3JcF7qUhYOeyuVyGRfOcSYl3p+Un7Q6gplQxuHwgfAGzscy
> >>
> 21RijBGbpaC0MlBl5sjZA/UB8RSlQRBE0ERcmHTJDJHAd1YwFtfitSGBQCQVcCZKPld+0ZCPo2Fj
> >>
> l9j56jOqFF0tVYmSLjvFvwkBPIw/XQSmwFeaDBKbObRSAxqKjtKdlFnVp1fpWRIawcXnLmbXU0Cp
> >>
> xrGePykOIrQmt+3cVvt7cYwLMYHCA95WtJwLFw1mz4gaUcTZQm5mv2XpBSAggaBw8hqFjrULNSDN
> >>
> BZX6wijU83JuOYPEk2J7dAKTvoTwS/rDykh1jjMZksqZb4m9sFLOTmBDDHJ7CBLsB+aqorCTZVXZ
> >>
> ATqBmbe7BFH5b602GJUyqlRSVwQiu8eYJrutyy3SLYzxV8xlbFWmPcPTquR/QnDaVlHEOLF+cfZY
> >>
> VjjJdlDkGAphXgry5IDy2CTS/mYpKA/bN10oxByP4NUXmaS66/CsvKsKsIqKtvXk6IppjYmYcscN
> >>
> q4kMXYlA486YRuWa2Zr0gqZWAMmgUz0gZ4cuncYgak6kxLrGzXPFGcUi4GizLUs1BmcqtOC8FVlj
> >>
> J2fK3bIBaYjVU4guYSo4Eg1GDI0IlMUbdxHMuEXerB/fi6Fn9Usg2ozJ4xEnLVn7Do9YK07T5m5H
> >>
> 4Td4FYd3Lp5Akkl5W6jCDnHn7S0AIj+dZyILpF9xqdI2oh6k9D19aVKNVhrRHeV/30hQzwzO8l4/
> >>
> xVYMMa8An8lBVGSwTmrK1aFELS6igGy64rlcwtddcQHk6MEElSSmxBfmY1NFeN8ywNDvcujkP2CO
> >>
> vbzPvDoqI9VE7sQGAIKiR/P6xJBJFgOWVSCC+5Hige6txuN3VuN6d02xnXfOF1TkXa9b+u6OMITI
> >>
> 4IunIdIii/vvY1G8minMgLAI3CMgKA84OrqSoKRgKaTVQhFBhJRww8gSzApcxUyXyywJy5SZjh2g
> >>
> ciJxI88xqVhRJzpwub16yyPACbj/ZUJ9SSnUsonY3r0YFR9Vy5Fr+wjcrc0WL5i2iWiBnNTk6AKW
> >>
> 8jnwiWW8HayhEji6ASKpRCpkFhNPcexFHfvOaqbSYfmIuY02iaokgyJiVPNtyHoTtBXr5LP84Yem
> >>
> hjE9eC5QqXoxU8qenfKhFs7EwTCjYMi9v67csj0IrwQ3DgTtoVLYZvUzmCw0Z2GmRDMIdkSHDEfJ
> >>
> yTApmvdqCeFM9Hp10dmIR2fZtaUs1/iG5p/k+OOItI4BwxUEyM4LLa4EzAqh+nMPfP08lbUk7Ogo
> >>
> Q5E19Q0hqsMmE0YMpeWQkImzq8Fa1khsZ4coygQDkNBFbkYuD5aIjDCTGsZJfZeoiGR8AL/0Bc1q
> >>
> FutHcTCL1BBfH1R9e4DpzzWlVEshJzLeuoF617YJ9XK09mQ72OqToJGBIxCguiD1FDAZm/whpBVS
> >>
> V0riw+2X/OW2Fs0bRdbFkcqHZ0aA2YJr+ugzxqWSy1vasELyNriZbVpNAZOJEL0VTHnMIlBSIK32
> >>
> bEF4ZCbTWoERjkpxBWnhHiaLRaO6Axagitfb/cZmHQYBatCzm74qzEnNU8OuxXUx+OBBgaDuUPJ4
> >>
> iZkoj+a2+i+hFXqo0MKxhMyK3GdLeE3SiJF+/lGQUr1WCWdgmyZgsEOsfTcL6/QCGecguVwcQLAU
> >>
> A4pKaRa4HyEjAmHXhkTsyOcgh2pg9D12WLrLph79iS49DnlMhIlmx/HLpAYGGOWNarsgDJLmtYlD
> >>
> 37woQs5W8liulzM33GZHyBRRS53PVkHlD3QEOC2aiBoSVJeRoPmCiA+li80+sFYsHtt1pgk9Zn5h
> >>
> Y8A4HnqzMmSkOI2n7I6QVa/RoCG8MxGaABPc1zrLMptqx84uUbQQruRAtDzrCCNqwBaiPFGAsWTK
> >>
> 51QqeCQQL0axyIQdj4y9s5WN8DRC2RGXKNnAvkf+Vrhaio6BAukDreA6mSYjC50LWyT6TftIDwB9
> >>
> VRDYyB7s+o0kWGXTpUUbFtQYFQJkRXZs9zhj+C+QKAjiaRSrDHs4V5nIpK6+NTkWTDIkWLii/MuR
> >> 8zuvNFyRpm+F/sBbhe4WE0chqxglinQntAtNCF+MQv0ZSTijf8XckU4UJCRrkPyA
> >>
> >>
> >> -- 
> >> MySQL Code Commits Mailing List
> >> For list archives: http://lists.mysql.com/commits
> >> To unsubscribe:    http://lists.mysql.com/commits?unsub=1
> >>      
> >
> >    
> 
> 


Thread
bzr commit into mysql-trunk branch (daogang.qu:3214) WL#5493daogang.qu12 Jan
  • Re: bzr commit into mysql-trunk branch (daogang.qu:3214) WL#5493anders13 Jan
    • Re: bzr commit into mysql-trunk branch (daogang.qu:3214) WL#5493Daogang Qu13 Jan
      • Re: bzr commit into mysql-trunk branch (daogang.qu:3214) WL#5493anders13 Jan
        • Re: bzr commit into mysql-trunk branch (daogang.qu:3214) WL#5493Daogang Qu13 Jan