bzr commit into mysql-6.0-maria branch (guilhem:2686)

[Guilhem Bichot]

#At file:///home/mysql_src/bzrrepos/mysql-6.0-maria2/

 2686 Guilhem Bichot	2008-06-26
      post-merge fix (error message changed in 6.0)
modified:
  mysql-test/r/maria_notembedded.result
  mysql-test/t/maria_notembedded.test

per-file messages:
  mysql-test/r/maria_notembedded.result
    post-merge fix
  mysql-test/t/maria_notembedded.test
    post-merge fix
=== modified file 'mysql-test/r/maria_notembedded.result'
--- a/mysql-test/r/maria_notembedded.result	2008-02-15 17:29:53 +0000
+++ b/mysql-test/r/maria_notembedded.result	2008-06-26 19:56:53 +0000
@@ -1,7 +1,7 @@
 set session storage_engine=maria;
 create table t1 (a int) row_format=page;
 insert delayed into t1 values(1);
-ERROR HY000: Table storage engine for 't1' doesn't have this option
+ERROR HY000: DELAYED option not supported for table 't1'
 drop table t1;
 create table t1 (a int) row_format=page transactional=0;
 insert delayed into t1 values(1);

=== modified file 'mysql-test/t/maria_notembedded.test'
--- a/mysql-test/t/maria_notembedded.test	2008-02-15 17:29:53 +0000
+++ b/mysql-test/t/maria_notembedded.test	2008-06-26 19:56:53 +0000
@@ -10,7 +10,7 @@ set session storage_engine=maria;
 # ("embedded" server translates them to plain INSERT)
 
 create table t1 (a int) row_format=page;
---error ER_ILLEGAL_HA
+--error ER_DELAYED_NOT_SUPPORTED
 insert delayed into t1 values(1);
 drop table t1;
 create table t1 (a int) row_format=page transactional=0;