maria suite ok

mysql-test/include/ipv6_clients.inc

---exec $MYSQLADMIN --no-defaults --default-character-set=latin1 -h $IPv6 -P $MASTER_MYPORT  -u root ping 
+--exec $MYSQLADMIN --default-character-set=latin1 -h $IPv6 -P $MASTER_MYPORT  -u root ping 
 --disable_result_log
 --exec $MYSQL_CHECK -h $IPv6 -P $MASTER_MYPORT  -u root test 
 --exec $MYSQL_DUMP -h $IPv6 -P $MASTER_MYPORT  -u root test 

mysql-test/include/mysqladmin_shutdown.inc

 # Initiates a clean shutdown of the server and waits for its completion
 
---exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT  -u root --password= shutdown 2>&1;
+--exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT  -u root --password= shutdown 2>&1;
 
 # On Windows mysqladmin does not wait for shutdown to be finished,
 # so we have to monitor this with our connection:

mysql-test/mysql-test-run.pl

@@ -2225,8 +2225,8 @@ sub mysqld_client_arguments () {
 
 
 sub have_maria_support () {
-  my $maria_var= $mysqld_variables{'aria'};
-  return defined $maria_var and $maria_var eq 'TRUE';
+  my $maria_var= $mysqld_variables{'aria-recover'};
+  return defined $maria_var;
 }
 
 #

mysql-test/suite/maria/r/compat_aliases.result

 select * from information_schema.plugins where plugin_name like '%aria';
-PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_TYPE_VERSION	PLUGIN_LIBRARY	PLUGIN_LIBRARY_VERSION	PLUGIN_AUTHOR	PLUGIN_DESCRIPTION	PLUGIN_LICENSE	PLUGIN_MATURITY	PLUGIN_AUTH_VERSION
-Maria	1.5	ACTIVE	DAEMON	50507.0	NULL	NULL	Monty Program Ab	Compatibility aliases for the Aria engine	GPL	Gamma	1.5
-Aria	1.5	ACTIVE	STORAGE ENGINE	50507.0	NULL	NULL	Monty Program Ab	Crash-safe tables with MyISAM heritage	GPL	Gamma	1.5
+PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_TYPE_VERSION	PLUGIN_LIBRARY	PLUGIN_LIBRARY_VERSION	PLUGIN_AUTHOR	PLUGIN_DESCRIPTION	PLUGIN_LICENSE	LOAD_OPTION	PLUGIN_MATURITY	PLUGIN_AUTH_VERSION
+Maria	1.5	ACTIVE	DAEMON	50515.0	NULL	NULL	Monty Program Ab	Compatibility aliases for the Aria engine	GPL	FORCE	Gamma	1.5
+Aria	1.5	ACTIVE	STORAGE ENGINE	50515.0	NULL	NULL	Monty Program Ab	Crash-safe tables with MyISAM heritage	GPL	FORCE	Gamma	1.5
 select maria_vars.variable_name, aria_vars.variable_name from
 information_schema.session_variables as maria_vars left join
 information_schema.session_variables as aria_vars

mysql-test/suite/maria/r/maria-recovery2.result

@@ -84,11 +84,10 @@ Table	Op	Msg_type	Msg_text
 mysqltest.t1	check	status	OK
 * testing that checksum after recovery is as expected
 Checksum-check
-failure
+ok
 use mysqltest;
 select * from t1;
 a
-1
 3
 drop table t1;
 * TEST of recovery when crash before bulk-insert-with-repair is committed

mysql-test/suite/maria/r/maria3.result

@@ -619,3 +619,6 @@ ERROR 23000: Duplicate entry '2' for key 'a'
 insert into t1 values(3);
 insert into t2 values(3);
 drop table t1, t2;
+create table t1 (a int) engine=aria;
+lock table t1 write;
+drop table t1;

mysql-test/suite/maria/suite.pm

@@ -2,7 +2,7 @@ package My::Suite::Maria;
 
 @ISA = qw(My::Suite);
 
-return "Need Aria engine" unless $::mysqld_variables{'aria'} eq "ON";
+return "Need Aria engine" unless defined $::mysqld_variables{'aria-recover'};
 
 bless { };
 

mysql-test/suite/maria/t/maria3.test

@@ -191,7 +191,6 @@ drop table t1;
 CREATE TABLE t1 (a int, b int, v varchar(60000)) checksum=1 engine=aria;
 insert into t1 values (1,1,"aaa"),(1,2,null);
 checksum table t1;
-lock table t1 write;
 insert into t1 values (1,3,repeat('c',30000)),(4,4,repeat('a',30000));
 update t1 set v="row5" where b=4;
 delete from t1 where b=3;
@@ -522,6 +521,10 @@ drop table t1, t2;
 
 # End of 5.1 tests
 
+create table t1 (a int) engine=aria;
+lock table t1 write;
+drop table t1;
+
 --disable_result_log
 --disable_query_log
 eval set global storage_engine=$default_engine,

sql/handler.cc

@@ -1162,7 +1162,7 @@ int ha_commit_trans(THD *thd, bool all)
   }
 
 #ifdef WITH_ARIA_STORAGE_ENGINE
-    ha_maria::implicit_commit(thd, TRUE);
+    ha_maria::implicit_commit(thd, FALSE);
 #endif
 
   if (ha_info)