maria-developers team mailing list archive

Thread
Date

maria-developers team
Mailing list archive
Message #01929

bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2801)

To: maria-developers@xxxxxxxxxxxxxxxxxxx
From: Michael Widenius <monty@xxxxxxxxxxxx>
Date: Fri, 15 Jan 2010 18:18:46 -0000
User-agent: Bazaar (2.0.3)

#At lp:maria based on revid:knielsen@xxxxxxxxxxxxxxx-20100115170257-h7nt8f7bvzxa9lfe

 2801 Michael Widenius	2010-01-15 [merge]
      Automatic merge
      removed:
        mysql-test/suite/maria/t/maria2-master.opt

=== removed file 'mysql-test/suite/maria/t/maria2-master.opt'
--- a/mysql-test/suite/maria/t/maria2-master.opt	2010-01-15 15:27:55 +0000
+++ b/mysql-test/suite/maria/t/maria2-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---secure-file-priv="../../std_data"