Re: [Maria-developers] Rev 2726: Exclude innodb_plugin form MariaDB's max and max-no-ndb configurations and in file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/

2009-09-10 Thread Kristian Nielsen
Hm, seems I forgot to attach the patch. - Kristian. === modified file 'mysql-test/r/innodb.result' --- mysql-test/r/innodb.result 2009-09-07 20:50:10 + +++ mysql-test/r/innodb.result 2009-09-10 13:00:42 + @@ -1738,7 +1738,7 @@ count(*) drop table t1; SELECT variable_value FROM informat

Re: [Maria-developers] Rev 2726: Exclude innodb_plugin form MariaDB's max and max-no-ndb configurations and in file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/

2009-09-10 Thread Kristian Nielsen
Hi Sergey, Attached patch fixes two more failures in the merge as seen in Buildbot. The main.innodb failures are two different issues. One I already fixed in another place in XtraDB, I added a comment to explain better. The other looks like a merge error, the result file was changed in the merge

Re: [Maria-developers] Rev 2721: Merge xtradb-7 -> MariaDB in file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/

2009-09-10 Thread Kristian Nielsen
Sergey Petrunya writes: > At file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/ > > > revno: 2721 > revision-id: pser...@askmonty.org-20090908160458-fglojzacu8inqb9q > parent: pser...@askmonty.org-20090907205010-tnvi4bomzq2b1eut > par

Re: [Maria-developers] Rev 2723: MySQL 5.1 -> MariaDB 5.1 merge in file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/

2009-09-10 Thread Henrik Ingo
On Thu, Sep 10, 2009 at 12:07 AM, Sergey Petrunya wrote: > --- a/README    2009-09-08 16:04:58 + > +++ b/README    2009-09-09 21:06:57 + Hi At some point after your merge activities stabilize, could someone post the README here so I can review it by email? (I'm a manager, have not got bz

Re: [Maria-developers] Rev 2723: MySQL 5.1 -> MariaDB 5.1 merge in file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/

2009-09-10 Thread Kristian Nielsen
Sergey Petrunya writes: > At file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/ > > > revno: 2723 > revision-id: pser...@askmonty.org-20090909210657-i1of5o03ymoozwvs > parent: pser...@askmonty.org-20090908162138-wtd6r54dkcp4hg5a > com

[Maria-developers] Rev 2726: Exclude innodb_plugin form MariaDB's max and max-no-ndb configurations and in file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/

2009-09-10 Thread Sergey Petrunya
At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/ revno: 2726 revision-id: pser...@askmonty.org-20090910081123-1hg7mxrfguchn811 parent: pser...@askmonty.org-20090910080750-tcyaxkh0wwpgqzad committer: Sergey Petrunya branch nick: m

[Maria-developers] Rev 2725: Fix windows build: add strmov_overlapp.c to CMakeLists.txt in file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/

2009-09-10 Thread Sergey Petrunya
At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/ revno: 2725 revision-id: pser...@askmonty.org-20090910080750-tcyaxkh0wwpgqzad parent: pser...@askmonty.org-20090909215928-jd9v62cem7e2uukw committer: Sergey Petrunya branch nick: m