Fix for maria.test failure in embedded server (test split)

mysql-test/r/maria.result:
  result update
mysql-test/t/maria.test:
  The embedded server translates INSERT DELAYED to plain INSERT
  so does not produce an error; moving this test to a new test
  which is not run for the embedded server.
mysql-test/r/maria_notembedded.result:
  result is ok
mysql-test/t/maria_notembedded.test:
  New test for cases where embedded server is different.

4 files changed, 58 insertions, 42 deletions

diff --git a/mysql-test/r/maria.result b/mysql-test/r/maria.result
index 937241f2da8..d2894ce39c2 100644
--- a/mysql-test/r/maria.result
+++ b/mysql-test/r/maria.result
@@ -1923,30 +1923,6 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=MARIA DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 drop table t1;
-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
-drop table t1;
-create table t1 (a int) row_format=page transactional=0;
-insert delayed into t1 values(1);
-flush table t1;
-select * from t1;
-a
-1
-select count(*) from t1;
-count(*)
-1
-drop table t1;
-create table t1 (a int) row_format=dynamic;
-insert delayed into t1 values(1);
-flush table t1;
-select * from t1;
-a
-1
-select count(*) from t1;
-count(*)
-1
-drop table t1;
 create table `t1` (
 t1_name varchar(255) default null,
 t1_id int(10) unsigned not null auto_increment,
diff --git a/mysql-test/r/maria_notembedded.result b/mysql-test/r/maria_notembedded.result
new file mode 100644
index 00000000000..36124e6351c
--- /dev/null
+++ b/mysql-test/r/maria_notembedded.result
@@ -0,0 +1,25 @@
+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
+drop table t1;
+create table t1 (a int) row_format=page transactional=0;
+insert delayed into t1 values(1);
+flush table t1;
+select * from t1;
+a
+1
+select count(*) from t1;
+count(*)
+1
+drop table t1;
+create table t1 (a int) row_format=dynamic;
+insert delayed into t1 values(1);
+flush table t1;
+select * from t1;
+a
+1
+select count(*) from t1;
+count(*)
+1
+drop table t1;
diff --git a/mysql-test/t/maria.test b/mysql-test/t/maria.test
index 98ae5d1dd21..e6c4881f820 100644
--- a/mysql-test/t/maria.test
+++ b/mysql-test/t/maria.test
@@ -1172,24 +1172,6 @@ alter table t1 row_format=DYNAMIC;
 show create table t1;
 drop table t1;
 
-# Verify that INSERT DELAYED is disabled only for transactional tables
-create table t1 (a int) row_format=page;
---error ER_ILLEGAL_HA
-insert delayed into t1 values(1);
-drop table t1;
-create table t1 (a int) row_format=page transactional=0;
-insert delayed into t1 values(1);
-flush table t1;
-select * from t1;
-select count(*) from t1;
-drop table t1;
-create table t1 (a int) row_format=dynamic;
-insert delayed into t1 values(1);
-flush table t1;
-select * from t1;
-select count(*) from t1;
-drop table t1;
-
 # CHECK TABLE was reporting
 # "Size of datafile is: 0         Should be: 16384"
 #
diff --git a/mysql-test/t/maria_notembedded.test b/mysql-test/t/maria_notembedded.test
new file mode 100644
index 00000000000..0ee6a69c487
--- /dev/null
+++ b/mysql-test/t/maria_notembedded.test
@@ -0,0 +1,33 @@
+# Tests which cannot be run in embedded server.
+
+-- source include/not_embedded.inc
+-- source include/have_maria.inc
+
+let $default_engine=`select @@session.storage_engine`;
+set session storage_engine=maria;
+
+# Verify that INSERT DELAYED is disabled only for transactional tables
+# ("embedded" server translates them to plain INSERT)
+
+create table t1 (a int) row_format=page;
+--error ER_ILLEGAL_HA
+insert delayed into t1 values(1);
+drop table t1;
+create table t1 (a int) row_format=page transactional=0;
+insert delayed into t1 values(1);
+flush table t1;
+select * from t1;
+select count(*) from t1;
+drop table t1;
+create table t1 (a int) row_format=dynamic;
+insert delayed into t1 values(1);
+flush table t1;
+select * from t1;
+select count(*) from t1;
+drop table t1;
+
+--disable_result_log
+--disable_query_log
+eval set session storage_engine=$default_engine;
+--enable_result_log
+--enable_query_log