5.1-18205-wl5151 : Code : Percona Server moved to https://jira.percona.com/projects/PS

Get this branch:: bzr branch lp:~tsarev/percona-server/5.1-18205-wl5151

Only Oleg Tsarev can upload to this branch. If you are Oleg Tsarev please log in for upload directions.

Branch merges

No branches dependent on this one.

Rejected for merging into lp:percona-server/5.1

Percona core: Pending requested 2012-02-22

Diff: 5379 lines (+3366/-486)

47 files modified

Percona-Server/client/mysqlbinlog.cc (+1/-0)
Percona-Server/libmysqld/Makefile.am (+1/-1)
Percona-Server/mysql-test/extra/rpl_tests/check_type.inc (+52/-0)
Percona-Server/mysql-test/extra/rpl_tests/rpl_extra_col_master.test (+7/-6)
Percona-Server/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test (+24/-16)
Percona-Server/mysql-test/extra/rpl_tests/rpl_row_basic.test (+41/-13)
Percona-Server/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test (+4/-4)
Percona-Server/mysql-test/extra/rpl_tests/type_conversions.test (+882/-0)
Percona-Server/mysql-test/include/test_fieldsize.inc (+1/-1)
Percona-Server/mysql-test/r/percona_server_variables_debug.result (+1/-0)
Percona-Server/mysql-test/r/percona_server_variables_release.result (+1/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_base64_flag.result (+1/-0)
Percona-Server/mysql-test/suite/binlog/t/binlog_base64_flag.test (+1/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_bug31076.result (+3/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_colSize.result (+3/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result (+18/-18)
Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result (+18/-18)
Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result (+27/-24)
Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result (+27/-24)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result (+6/-10)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result (+12/-10)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_colSize.result (+26/-26)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result (+7/-7)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result (+7/-7)
Percona-Server/mysql-test/suite/rpl/r/rpl_typeconv.result (+539/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_bug31076.test (+6/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_colSize.test (+5/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test (+2/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_row_colSize.test (+4/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_typeconv.test (+75/-0)
Percona-Server/sql/field.cc (+291/-66)
Percona-Server/sql/field.h (+29/-23)
Percona-Server/sql/log_event.cc (+55/-34)
Percona-Server/sql/log_event_old.cc (+20/-4)
Percona-Server/sql/mysql_priv.h (+1/-0)
Percona-Server/sql/mysqld.cc (+23/-0)
Percona-Server/sql/rpl_record.cc (+79/-13)
Percona-Server/sql/rpl_rli.h (+14/-6)
Percona-Server/sql/rpl_utility.cc (+869/-44)
Percona-Server/sql/rpl_utility.h (+80/-111)
Percona-Server/sql/set_var.cc (+33/-0)
Percona-Server/sql/set_var.h (+1/-0)
Percona-Server/sql/share/errmsg.txt (+6/-0)
Percona-Server/sql/sql_class.h (+2/-0)
Percona-Server/sql/sql_select.cc (+12/-0)
doc/source/flexibility/rbr_slave_type_conversion.rst (+48/-0)
doc/source/index.rst (+1/-0)

Superseded for merging into lp:percona-server/5.5

Percona core: Pending requested 2012-02-22

Diff: 5440 lines (+3417/-486) (has conflicts)

49 files modified

COPYING.show_temp_51 (+13/-0)
Percona-Server/client/mysqlbinlog.cc (+1/-0)
Percona-Server/libmysqld/Makefile.am (+1/-1)
Percona-Server/mysql-test/extra/rpl_tests/check_type.inc (+52/-0)
Percona-Server/mysql-test/extra/rpl_tests/rpl_extra_col_master.test (+7/-6)
Percona-Server/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test (+24/-16)
Percona-Server/mysql-test/extra/rpl_tests/rpl_row_basic.test (+41/-13)
Percona-Server/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test (+4/-4)
Percona-Server/mysql-test/extra/rpl_tests/type_conversions.test (+882/-0)
Percona-Server/mysql-test/include/test_fieldsize.inc (+1/-1)
Percona-Server/mysql-test/r/percona_server_variables_debug.result (+1/-0)
Percona-Server/mysql-test/r/percona_server_variables_release.result (+1/-0)
Percona-Server/mysql-test/suite/binlog/r/binlog_base64_flag.result (+1/-0)
Percona-Server/mysql-test/suite/binlog/t/binlog_base64_flag.test (+1/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_bug31076.result (+3/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_colSize.result (+3/-0)
Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result (+18/-18)
Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result (+18/-18)
Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result (+27/-24)
Percona-Server/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result (+27/-24)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result (+6/-10)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result (+12/-10)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_colSize.result (+26/-26)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result (+7/-7)
Percona-Server/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result (+7/-7)
Percona-Server/mysql-test/suite/rpl/r/rpl_typeconv.result (+539/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_bug31076.test (+6/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_colSize.test (+5/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test (+2/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_row_colSize.test (+4/-0)
Percona-Server/mysql-test/suite/rpl/t/rpl_typeconv.test (+75/-0)
Percona-Server/sql/field.cc (+291/-66)
Percona-Server/sql/field.h (+29/-23)
Percona-Server/sql/log_event.cc (+55/-34)
Percona-Server/sql/log_event_old.cc (+20/-4)
Percona-Server/sql/mysql_priv.h (+1/-0)
Percona-Server/sql/mysqld.cc (+23/-0)
Percona-Server/sql/rpl_record.cc (+79/-13)
Percona-Server/sql/rpl_rli.h (+14/-6)
Percona-Server/sql/rpl_utility.cc (+869/-44)
Percona-Server/sql/rpl_utility.h (+80/-111)
Percona-Server/sql/set_var.cc (+33/-0)
Percona-Server/sql/set_var.h (+1/-0)
Percona-Server/sql/share/errmsg.txt (+6/-0)
Percona-Server/sql/sql_class.h (+2/-0)
Percona-Server/sql/sql_select.cc (+12/-0)
doc/source/flexibility/rbr_slave_type_conversion.rst (+48/-0)
doc/source/index.rst (+1/-0)
lrusort.py (+38/-0)

Related bugs

Link a bug report

Related blueprints

Branch information

Owner:: Oleg Tsarev

Project:: Percona Server moved to https://jira.percona.com/projects/PS

Status:: Development

Recent revisions

431. By Oleg Tsarev on 2012-02-22: add documentation for wl5151
430. By Oleg Tsarev on 2012-02-21: Merge feature WL #5151
429. By Oleg Tsarev on 2012-02-16: Merge feature WL #47 - annotate rows log events
428. By Oleg Tsarev on 2012-02-16: merge lp:~tsarev/percona-server/5.1-18205_02_wl36.patch
427. By Hrvoje Matijakovic on 2012-02-10: added PS-5.1.61 release notes
426. By Hrvoje Matijakovic on 2012-02-08: merge from lp:~hrvojem/percona-server/docversionsplit-5.1
425. By Laurynas Biveinis on 2012-02-07: Automerge lp:~stewart/percona-server/rebase-onto-5.1.61
424. By Laurynas Biveinis on 2012-02-07: Automerge lp:~tsarev/percona-server/5.1_fix_bug_909281
423. By Hrvoje Matijakovic on 2012-02-02: bugfix for Bug #924194
422. By Hrvoje Matijakovic on 2012-01-31: bugfixes for bug898333 and bug897858

»

Branch metadata

Branch format:: Branch format 7

Repository format:: Bazaar repository format 2a (needs bzr 1.16 or later)

Percona Server moved to https://jira.percona.com/projects/PS

lp:~tsarev/percona-server/5.1-18205-wl5151

Branch merges

Related source package recipes

Related snap packages

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Nearby

Subscribers