Kristian, We are about to finalize xtradb-release6, I think it makes sense to push this new release.
I am trying to incorporate your changes, but bzr branch lp:~maria-captains/maria/mariadb-xtradb-merge2 takes ages and it failed twice for me due "broken connection" error, so I had no success here yet. Kristian Nielsen wrote: > Regarding the XtraDB merge into MariaDB, I am now finally getting ready to > push the merge, after lots of small fixes in different areas. > > The code is available in the mariadb-xtradb-merge2 branch: > > https://code.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2 > > The buildbot testing is here: > > https://askmonty.org/buildbot/waterfall?branch=mariadb-xtradb-merge2 > > Vadim, there is one remaining issue that I need Percona to look into. This is > a hang in the innodb_xtradb_bug317074 test case on host > hardy-amd64-dbg. Test output is included at the end of this mail, and full log > is here: > > > https://askmonty.org/buildbot/builders/hardy-amd64-dbg/builds/69/steps/test/logs/stdio > > Please take a look and see what it could be. The failure seems to be > repeatable on that host. If needed, we can probably talk to archivist (who > runs that build slave) on getting access to debug etc. > > I would also like your opinion on whether this is something that should block > pushing the merge into MariaDB, as it is the last remaining known issue. > > Also, I was wondering if there is some way that Percona and MariaDB engineers > could be on the same IRC channel(s)? That might be useful for some of the > discussions. MariaDB engineers already hang out in #maria on FreeNode. > > > Vadim Tkachenko <[email protected]> writes: > >> I will look how we can backport your changes. >> We need to have xtradb compiled against standard 5.1, if it is not >> broken - it should be not problem to include your fixes. > > I am pretty sure there are no changes that would not work with 5.1. There are > of course a number of changes that should _not_ go into the Percona XtraDB > repository, like the replacing of innodb with xtradb etc. > > Here is an annotated list of the changes I think you should consider including > upstream in XtraDB. If you choose to include any of them, it would be a help > if you can do them in one (or a few) separate commits without any other > changes. This will allow a simple null-merge to deal with merge conflits in > any following xtradb->mariadb merges. > > > Revision: 2716 > http://bazaar.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2/revision/2716 > > The fix in mysql-test/t/innodb_information_schema.test would be relevant > to merge into XtraDB. > > > Revision: 2714 > http://bazaar.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2/revision/2714 > > Here the test case fixes may be relevant. And there is a bug fix for ALTER > TABLE in ha_innodb.cc ha_innobase::check_if_incompatible_data() that is > needed to work with latest MySQL 5.1 sources (should also be ok with older > 5.1 versions). > > There are also a few minor merges of changes from MySQL 5.1 to innodb not > in the innodb plugin, which may or may not make sense for XtraDB to merge > (probably doesn't matter). > > > Revision: 2697.3.4 > http://bazaar.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2/revision/2697.3.4 > > This is fixes for test suite failures. I think most are not relevant, > however changes to these files fixes a test failure: > > mysql-test/t/innodb-zip.test > mysql-test/r/innodb-zip.result > > > As far as I can tell, remaining changes are either outside the innobase > storage engine code (so cannot be meaningfully merged into XtraDB), or fixes > mainly relevant for the merge into MariaDB. > > - Kristian. > > ----------------------------------------------------------------------- > main.innodb_xtradb_bug317074 [ fail ] timeout after 900 seconds > Test ended at 2009-06-23 15:20:52 > > Test case timeout after 900 seconds > > == > /home/archivist/archivist-amd64/archivist-amd64/build/mysql-test/var/1/log/innodb_xtradb_bug317074.log > == > SET @save_innodb_file_format=@@global.innodb_file_format; > SET @save_innodb_file_format_check=@@global.innodb_file_format_check; > SET @save_innodb_file_per_table=@@global.innodb_file_per_table; > SET GLOBAL innodb_file_format='Barracuda'; > SET GLOBAL innodb_file_per_table=ON; > -- Vadim Tkachenko, CTO Percona Inc. ICQ: 369-510-335, Skype: vadimtk153, Phone +1-888-401-3403 MySQL Performance Blog - http://www.mysqlperformanceblog.com MySQL Consulting http://www.percona.com/ _______________________________________________ Mailing list: https://launchpad.net/~maria-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~maria-developers More help : https://help.launchpad.net/ListHelp
