Merge authors: Arjen Lentz (arjen-lentz) Kristian Nielsen (knielsen) Oleksandr "Sanja" Byelkin (sanja-byelkin) Sergey Petrunia (sergefp) ------------------------------------------------------------ revno: 2746 [merge] committer: Michael Widenius <monty@askmonty.org> branch nick: mysql-maria timestamp: Wed 2009-10-14 11:09:56 +0300 message: Automatic merge with 5.1-merge added: BUILD/compile-pentium-debug-max-no-qc mysql-test/r/mysqltest_ps.result mysql-test/t/mysqltest_ps.test win/configure-mariadb.sh win/make_mariadb_win_dist modified: BUILD/SETUP.sh Makefile.am client/mysqltest.cc configure.in mysql-test/include/read_many_rows.inc mysql-test/lib/My/ConfigFactory.pm mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl mysql-test/r/read_many_rows_innodb.result mysql-test/suite/funcs_1/datadict/processlist_priv.inc mysql-test/suite/funcs_1/datadict/processlist_val.inc mysql-test/suite/funcs_1/r/is_columns_is.result mysql-test/suite/funcs_1/r/is_tables_is.result mysql-test/suite/funcs_1/r/is_tables_myisam.result mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result mysql-test/suite/funcs_1/r/processlist_val_no_prot.result mysql-test/suite/funcs_1/t/is_columns_is.test mysql-test/suite/maria/t/maria-recover.test mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test mysql-test/suite/parts/t/partition_alter1_1_2_myisam.test mysql-test/suite/parts/t/partition_alter1_1_innodb.test mysql-test/suite/parts/t/partition_alter1_1_myisam.test mysql-test/suite/parts/t/partition_alter1_2_innodb.test mysql-test/suite/parts/t/partition_alter1_2_myisam.test mysql-test/suite/parts/t/partition_alter2_1_innodb.test mysql-test/suite/parts/t/partition_alter2_1_maria.test mysql-test/suite/parts/t/partition_alter2_1_myisam.test mysql-test/suite/parts/t/partition_alter2_2_innodb.test mysql-test/suite/parts/t/partition_alter2_2_maria.test mysql-test/suite/parts/t/partition_alter2_2_myisam.test mysql-test/suite/parts/t/partition_alter3_innodb.test mysql-test/suite/parts/t/partition_alter3_myisam.test mysql-test/suite/parts/t/partition_alter4_innodb.test mysql-test/suite/parts/t/partition_alter4_myisam.test mysql-test/suite/parts/t/partition_basic_innodb.test mysql-test/suite/parts/t/partition_basic_myisam.test mysql-test/suite/parts/t/partition_basic_symlink_myisam.test mysql-test/suite/parts/t/partition_engine_innodb.test mysql-test/suite/parts/t/partition_engine_myisam.test mysql-test/suite/parts/t/partition_recover_myisam.test mysql-test/suite/parts/t/partition_special_innodb.test mysql-test/suite/parts/t/partition_syntax_innodb.test mysql-test/suite/parts/t/partition_syntax_myisam.test mysql-test/suite/pbxt/r/connect.result mysql-test/suite/pbxt/r/mysqlslap.result mysql-test/suite/pbxt/r/ps_11bugs.result mysql-test/suite/pbxt/r/select.result mysql-test/suite/pbxt/r/union.result mysql-test/suite/pbxt/t/connect.test mysql-test/t/variables-big.test scripts/make_win_bin_dist sql/mysql_priv.h sql/mysqld.cc storage/maria/ha_maria.cc storage/maria/ma_state.c storage/maria/maria_def.h storage/myisam/ha_myisam.cc storage/myisam/mi_locking.c storage/myisam/myisamdef.h storage/pbxt/src/Makefile.am win/Makefile.am win/configure.js -- 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.