Merge authors: Kristian Nielsen (knielsen) Peter Lieverdink <me@cafuego.net> Sergey Petrunia (sergefp) ------------------------------------------------------------ revno: 2743 [merge] committer: knielsen@knielsen-hq.org branch nick: mariadb-5.1 timestamp: Tue 2009-10-06 20:37:55 +0200 message: Merge a bunch of small fixes from release tree into main lp:maria. added: mysql-test/include/have_working_dns.inc mysql-test/r/have_working_dns.require mysql-test/r/variables_debug_notembedded.result mysql-test/t/variables_debug_notembedded.test renamed: storage/innodb_plugin/plug.in => storage/innodb_plugin/plug.in.disabled storage/pbxt/src/CMakeLists.txt => storage/pbxt/CMakeLists.txt* modified: BUILD/SETUP.sh CMakeLists.txt Makefile.am config/ac-macros/libevent.m4 configure.in extra/libevent/Makefile.am libmysql/libmysql.def libmysqld/CMakeLists.txt libmysqld/libmysqld.def mysql-test/include/mtr_check.sql mysql-test/mysql-test-run.pl mysql-test/r/ctype_gbk_binlog.result mysql-test/r/information_schema.result mysql-test/r/innodb-index.result mysql-test/r/merge-big.result mysql-test/r/mysqlbinlog-cp932.result mysql-test/r/mysqlbinlog_row_big.result mysql-test/r/variables-big.result mysql-test/r/variables_debug.result mysql-test/suite/binlog/r/binlog_incident.result mysql-test/suite/binlog/r/binlog_tmp_table.result mysql-test/suite/binlog/t/binlog_incident.test mysql-test/suite/binlog/t/binlog_tmp_table.test mysql-test/suite/parts/inc/partition_key_32col.inc mysql-test/suite/parts/r/partition_special_innodb.result mysql-test/suite/parts/r/partition_special_myisam.result mysql-test/t/ctype_gbk_binlog.test mysql-test/t/events_time_zone.test mysql-test/t/information_schema.test mysql-test/t/innodb-index.test mysql-test/t/merge-big.test mysql-test/t/mysql.test mysql-test/t/mysql_upgrade.test mysql-test/t/mysqlbinlog-cp932.test mysql-test/t/mysqlbinlog_row_big.test mysql-test/t/variables-big.test mysql-test/t/variables_debug.test sql/sql_plugin.cc storage/maria/ma_blockrec.c storage/pbxt/Makefile.am storage/pbxt/src/Makefile.am storage/pbxt/src/pbms_enabled.cc storage/pbxt/src/thread_xt.cc support-files/compiler_warnings.supp win/Makefile.am storage/pbxt/CMakeLists.txt* -- 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.