Merge authors: Michael Widenius (monty) ------------------------------------------------------------ revno: 2829 [merge] committer: Michael Widenius <monty@askmonty.org> branch nick: maria-5.1 timestamp: Wed 2010-03-10 15:55:40 +0200 message: Automatic merge modified: mysql-test/r/foreign_key.result mysql-test/t/foreign_key.test sql/sql_delete.cc -- 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.