Merge authors: Kristian Nielsen (knielsen) Michael Widenius (monty) Peter Lieverdink <me@cafuego.net> Sergey Petrunia (sergefp) Related merge proposals: https://code.launchpad.net/~ourdelta-core/maria/maria-5.1-ourdelta/+merge/13... proposed by: Cafuego (cafuego) review: Approve - Kristian Nielsen (knielsen) ------------------------------------------------------------ revno: 2748 [merge] committer: Michael Widenius <monty@askmonty.org> branch nick: mysql-maria timestamp: Mon 2009-10-26 13:38:17 +0200 message: Automatic merge with maria-merge modified: Docs/INSTALL-BINARY Docs/myisam.txt Docs/mysql.info README configure.in libmysql/libmysql.c mysql-test/mysql-stress-test.pl mysys/my_init.c mysys/safemalloc.c scripts/make_binary_distribution.sh scripts/mysql_secure_installation.sh sql/mysqld.cc sql/sql_select.cc sql/udf_example.c storage/maria/Makefile.am storage/myisam/Makefile.am support-files/Makefile.am support-files/config.huge.ini.sh* support-files/config.medium.ini.sh* support-files/config.small.ini.sh* support-files/my-innodb-heavy-4G.cnf.sh support-files/my-small.cnf.sh support-files/mysql.server.sh -- 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.