Merge authors: Kristian Nielsen (knielsen) Paul McCullagh (paul-mccullagh) Related merge proposals: https://code.launchpad.net/~paul-mccullagh/maria/bug-422550/+merge/11076 proposed by: Paul McCullagh (paul-mccullagh) review: Approve - Kristian Nielsen (knielsen) ------------------------------------------------------------ revno: 2727 [merge] committer: knielsen@knielsen-hq.org branch nick: work timestamp: Fri 2009-09-04 09:45:34 +0200 message: Merge. - PBXT fixes. - MBug#423035 fix. - Compiler warning fixes. added: mysql-test/r/mysqld_option_err.result mysql-test/t/mysqld_option_err.test support-files/ccfilter modified: client/mysqlbinlog.cc config/ac-macros/misc.m4 extra/yassl/include/yassl_int.hpp extra/yassl/src/handshake.cpp extra/yassl/src/yassl_imp.cpp extra/yassl/src/yassl_int.cpp extra/yassl/taocrypt/include/modes.hpp extra/yassl/taocrypt/src/asn.cpp mysql-test/mysql-test-run.pl mysys/my_compress.c mysys/my_getopt.c sql/mysqld.cc storage/pbxt/ChangeLog storage/pbxt/src/Makefile.am storage/pbxt/src/datalog_xt.cc storage/pbxt/src/discover_xt.cc storage/pbxt/src/filesys_xt.cc storage/pbxt/src/ha_pbxt.cc storage/pbxt/src/memory_xt.cc storage/pbxt/src/myxt_xt.cc storage/pbxt/src/myxt_xt.h storage/pbxt/src/restart_xt.cc storage/pbxt/src/restart_xt.h storage/pbxt/src/strutil_xt.cc storage/pbxt/src/tabcache_xt.cc storage/pbxt/src/thread_xt.cc storage/pbxt/src/xaction_xt.cc storage/pbxt/src/xactlog_xt.cc storage/pbxt/src/xt_errno.h storage/xtradb/fil/fil0fil.c storage/xtradb/mtr/mtr0mtr.c storage/xtradb/srv/srv0srv.c storage/xtradb/srv/srv0start.c strings/decimal.c support-files/compiler_warnings.supp -- 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.