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

#At lp:maria based on revid:knielsen@knielsen-hq.org-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"