Merge authors: Bo Thorsen (bo.thorsen) Michael Widenius (monty) Sergei (sergii) ------------------------------------------------------------ revno: 2866 [merge] committer: Sergei Golubchik <sergii@pisem.net> branch nick: 5.1 timestamp: Mon 2010-06-14 19:05:32 +0200 message: merged modified: CMakeLists.txt client/mysqldump.c client/mysqltest.cc mysql-test/r/mysqldump.result mysql-test/r/openssl_1.result mysql-test/suite/maria/r/maria-recover.result mysql-test/suite/maria/r/maria3.result mysql-test/suite/maria/t/maria3.test storage/maria/ha_maria.cc storage/maria/ha_maria.h storage/maria/ma_blockrec.h storage/maria/ma_init.c storage/maria/ma_open.c storage/maria/ma_pagecache.c storage/maria/ma_recovery.c storage/maria/ma_state.c storage/maria/ma_static.c storage/maria/maria_def.h -- lp:~maria-captains/maria/5.1-converting https://code.launchpad.net/~maria-captains/maria/5.1-converting Your team Maria developers is subscribed to branch lp:~maria-captains/maria/5.1-converting. To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1-converting/+edit-subscr...