bzr push into mysql-6.0-maria branch (sanja:2706 to 2707)

[sanja]

 2707 sanja@stripped	2008-12-16
      Requirement to run the test only with maria engine added.
modified:
  mysql-test/suite/maria/t/maria-lock.test

 2706 Alexander Nozdrin	2008-12-15 [merge]
      Fix default.conf
modified:
  .bzr-mysql/default.conf

=== modified file 'mysql-test/suite/maria/t/maria-lock.test'
--- a/mysql-test/suite/maria/t/maria-lock.test	2008-10-23 16:29:52 +0000
+++ b/mysql-test/suite/maria/t/maria-lock.test	2008-12-16 20:09:23 +0000
@@ -2,6 +2,7 @@
 # Different cases involving locking that has failed with Maria
 #
 # Can't test with embedded server
+-- source include/have_maria.inc
 -- source include/not_embedded.inc
 
 --disable_warnings