Merge authors: Kristian Nielsen (knielsen) Michael Widenius (monty) Paul McCullagh (paul-mccullagh) Sergey Petrunia (sergefp) Vladimir Kolesnikov (vkolesnikov) Related merge proposals: https://code.launchpad.net/~paul-mccullagh/maria/maria-pbxt-1009g/+merge/166... proposed by: Paul McCullagh (paul-mccullagh) review: Approve - Kristian Nielsen (knielsen) https://code.launchpad.net/~vkolesnikov/maria/maria-pbxt-bug-439889/+merge/1... proposed by: Vladimir Kolesnikov (vkolesnikov) review: Approve - Kristian Nielsen (knielsen) ------------------------------------------------------------ revno: 2790 [merge] committer: knielsen@knielsen-hq.org branch nick: mariadb-5.1 timestamp: Wed 2010-01-06 12:29:19 +0100 message: Automatic merge. renamed: mysql-test/suite/pbxt/t/load_unique_error1.inc => mysql-test/std_data/pbxt_load_unique_error1.inc modified: .bzrignore config/ac-macros/plugins.m4 configure.in mysql-test/mysql-test-run.pl mysql-test/suite/pbxt/r/join_nested.result mysql-test/suite/pbxt/r/pbxt_bugs.result mysql-test/suite/pbxt/t/join_nested.test mysql-test/suite/pbxt/t/pbxt_bugs.test mysql-test/suite/pbxt/t/pbxt_locking.test mysql-test/suite/pbxt/t/pbxt_transactions.test mysql-test/suite/pbxt/t/ps_1general.test sql/handler.h sql/sql_plugin.cc storage/pbxt/ChangeLog storage/pbxt/plug.in storage/pbxt/src/Makefile.am storage/pbxt/src/discover_xt.cc storage/pbxt/src/ha_pbxt.cc storage/pbxt/src/strutil_xt.cc storage/pbxt/src/table_xt.cc storage/pbxt/src/thread_xt.cc storage/pbxt/src/trace_xt.cc -- lp:maria https://code.launchpad.net/~maria-captains/maria/5.1 Your team Maria developers is subscribed to branch lp:maria. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.