[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2766: Automatic merge

Merge authors: Michael Widenius (monty) revno: 2766 [merge] committer: Michael Widenius branch nick: maria-5.1 timestamp: Wed 2009-11-25 09:36:28 +0200 message: Automatic merge modified: include/mysys_err.h mysys/errors.c mysys

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2766)

#At lp:maria based on revid:mo...@mysql.com-20091116153408-azpb6hq1zfp1kpvv 2766 Michael Widenius 2009-11-25 [merge] Automatic merge modified: include/mysys_err.h mysys/errors.c mysys/my_seek.c sql/sql_insert.cc storage/maria/ha_maria.cc === m

Re: [Maria-developers] Test failures in PBXT after merging with MySQL-5.1.41

Kristian Nielsen writes: > PS. I now get this in the mysqld.err log after server shutdown in PBXT test > suite: > > 091124 13:09:45 [Warning] Plugin 'MyISAM' will be forced to shutdown > 091124 13:09:45 [Warning] Plugin 'PBXT' will be forced to shutdown Ok, some more details: I can repeat this

Re: [Maria-developers] Additional info about engines

Hi! 19 нояб. 2009, в 02:39, Michael Widenius написал(а): [skip] +#ifdef MARIADB +/* the plugin maturity (PLUGIN_MATURITY_XXX) */ +/* int */ +STRUCT_FLD(maturity, PLUGIN_MATURITY_RELEASE), +#endif + A little strange that you have to repeat the same thing many times. Somet

Re: [Maria-developers] Test failures in PBXT after merging with MySQL-5.1.41

Kristian Nielsen writes: > Paul McCullagh writes: > >> You are welcome to make the changes to the PBXT tests. For the PBXT >> trunk we are still using 5.1.35 for testing, but this should not be a >> problem. > > Ok, will do, I will send you a link to the patch/commit. Here it is: https://l

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2770)

#At lp:maria 2770 kniel...@knielsen-hq.org 2009-11-24 After-merge fixes for MySQL 5.1.41 merge: PBXT result file updates. modified: mysql-test/suite/pbxt/r/func_group.result mysql-test/suite/pbxt/r/grant.result mysql-test/suite/pbxt/r/group_min_max.result

Re: [Maria-developers] Test failures in PBXT after merging with MySQL-5.1.41

Paul McCullagh writes: > You are welcome to make the changes to the PBXT tests. For the PBXT > trunk we are still using 5.1.35 for testing, but this should not be a > problem. Ok, will do, I will send you a link to the patch/commit. > I had a look, and the only failure that is a bit odd is: pbx

[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2769)

#At lp:maria 2769 kniel...@knielsen-hq.org 2009-11-24 After-merge fix for MySQL 5.1.41 merge: suppress some warnings during shutdown. The MySQL 5.1.41 merge adds back some more warning lines in error log to be checked. So some suppressions for these new ones need to be

Re: [Maria-developers] Test failures in PBXT after merging with MySQL-5.1.41

Hi Kristian, apart from the error mentioned by Paul it looks like the rest of test results just need update. SHOW GRANTS needs resultset ordering. BR, Vlad Kristian Nielsen wrote: Hi Paul, Vladimir, We are working on merging latest MySQL (5.1.41) into MariaDB. After the merge, I see some t

Re: [Maria-developers] Test failures in PBXT after merging with MySQL-5.1.41

Hi Kristian, You are welcome to make the changes to the PBXT tests. For the PBXT trunk we are still using 5.1.35 for testing, but this should not be a problem. I had a look, and the only failure that is a bit odd is: pbxt.subselect mysqltest: At line 34: query 'SELECT 1 FROM (SELECT 1) a P

[Maria-developers] Test failures in PBXT after merging with MySQL-5.1.41

Hi Paul, Vladimir, We are working on merging latest MySQL (5.1.41) into MariaDB. After the merge, I see some test failures in the PBXT test suite. See here: https://askmonty.org/buildbot/builders/hardy-amd64-fulltest/builds/118/steps/test_2/logs/stdio Or if you prefer, see here for a searc