1 files changed, 30 insertions, 30 deletions

diff --git a/mysql-test/suite/maria/t/maria3.test b/mysql-test/suite/maria/t/maria3.test
index f2ae5d73fb2..55b5959a970 100644
--- a/mysql-test/suite/maria/t/maria3.test
+++ b/mysql-test/suite/maria/t/maria3.test
@@ -1,14 +1,14 @@
 -- source include/have_maria.inc
 
-select * from INFORMATION_SCHEMA.ENGINES where ENGINE="MARIA";
+select * from INFORMATION_SCHEMA.ENGINES where ENGINE="ARIA";
 
 let $default_engine=`select @@global.storage_engine`;
-let $default_checksum=`select @@global.maria_page_checksum`;
-set global storage_engine=maria;
-set session storage_engine=maria;
-set global maria_page_checksum=0;
-let $default_log_file_size=`select @@global.maria_log_file_size`;
-set global maria_log_file_size=4294967295;
+let $default_checksum=`select @@global.aria_page_checksum`;
+set global storage_engine=aria;
+set session storage_engine=aria;
+set global aria_page_checksum=0;
+let $default_log_file_size=`select @@global.aria_log_file_size`;
+set global aria_log_file_size=4294967295;
 
 # Initialise
 --disable_warnings
@@ -142,7 +142,7 @@ create table `t1` (
     t1_id int(10) unsigned not null auto_increment,
     key (t1_name),
     primary key (t1_id)
-) engine=maria auto_increment = 1000 default charset=latin1;
+) engine=aria auto_increment = 1000 default charset=latin1;
 lock tables t1 write;
 INSERT INTO `t1` VALUES ('bla',1000),('bla',1001),('bla',1002);
 check table t1;
@@ -188,7 +188,7 @@ drop table t1;
 # Test where we shrink varchar
 #
 
-CREATE TABLE t1 (a int, b int, v varchar(60000)) checksum=1 engine=maria;
+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;
@@ -239,13 +239,13 @@ CREATE TABLE t1 (
   KEY (ulong),
   KEY (ulonglong,ulong),
   KEY (options,flags)
-) engine=maria;
+) engine=aria;
 insert into t1 values (10,1,1,1,1,1,1,1,1,1,1,1,1,1,NULL,0,0,0,1,1,1,1,'one','one');
-create table t2 (primary key (auto)) engine=maria row_format=page select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
+create table t2 (primary key (auto)) engine=aria row_format=page select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
 check table t1,t2;
 select t1,t2,length(t3),length(t4),length(t5),length(t6),t7,t8 from t2;
 drop table t2;
-create table t2 (primary key (auto)) engine=maria row_format=dynamic select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
+create table t2 (primary key (auto)) engine=aria row_format=dynamic select auto+1 as auto,1 as t1, 'a' as t2, repeat('a',256) as t3, binary repeat('b',256) as t4, repeat('a',4096) as t5, binary repeat('b',4096) as t6, '' as t7, binary '' as t8 from t1;
 check table t2;
 drop table t1,t2;
 
@@ -259,9 +259,9 @@ drop table t1;
 
 # Fix if we are using safemalloc
 --replace_result 8388572 8388600
-select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "maria%" and variable_name not like "maria_used_for_temp_tables" order by 1;
+select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "aria%" and variable_name not like "aria_used_for_temp_tables" order by 1;
 --replace_column 2 #
-show status like 'maria%';
+show status like 'aria%';
 
 #
 # Test creating table with no field data and index on zero length columns
@@ -300,7 +300,7 @@ drop table t1;
 #
 # Show that page_checksum is remembered
 #
-set global maria_page_checksum=1;
+set global aria_page_checksum=1;
 create table t1 (a int);
 show create table t1;
 drop table t1;
@@ -310,7 +310,7 @@ drop table t1;
 #
 
 --enable_warnings
-set global maria_log_file_size=4294967296;
+set global aria_log_file_size=4294967296;
 
 #
 # Test delete of all rows in autocommit and not autocommit
@@ -338,10 +338,10 @@ create table t3 select * from t1, t2; # Should give an error
 create table t3 select t1.c AS c1, t2.c AS c2,1 as "const" from t1, t2;
 drop table t1, t2, t3;
 
-# Test for bug "maria_repair() (OPTIMIZE) leaves wrong
+# Test for bug "aria_repair() (OPTIMIZE) leaves wrong
 # data_file_length" (originally from type_datetime.test)
 
-create table t1 (t datetime) engine=maria;
+create table t1 (t datetime) engine=aria;
 insert into t1 values (101),(691231),(700101),(991231),(10000101),(99991231),(101000000),(691231000000),(700101000000),(991231235959),(10000101000000),(99991231235959),(20030100000000),(20030000000000);
 select * from t1;
 optimize table t1;
@@ -394,18 +394,18 @@ drop table t1;
 # Test warnings with transactional=1 with MyISAM
 #
 
-create table t1 (n int not null, c char(1)) engine=maria;
+create table t1 (n int not null, c char(1)) engine=aria;
 alter table t1 engine=myisam;
-alter table t1 engine=maria;
+alter table t1 engine=aria;
 show create table t1;
 drop table t1;
-create table t1 (n int not null, c char(1)) engine=maria transactional=1;
+create table t1 (n int not null, c char(1)) engine=aria transactional=1;
 alter table t1 engine=myisam;
-alter table t1 engine=maria;
+alter table t1 engine=aria;
 show create table t1;
 drop table t1;
 create table t1 (n int not null, c char(1)) engine=myisam transactional=1;
-alter table t1 engine=maria;
+alter table t1 engine=aria;
 show create table t1;
 drop table t1;
 
@@ -453,7 +453,7 @@ drop table t1, t2;
 
 #
 # Test problems with small rows and row_type=page 
-# Bug 35048 "maria table corruption reported when transactional=0"
+# Bug 35048 "aria table corruption reported when transactional=0"
 #
 
 create table t1 (i int auto_increment not null primary key) transactional=0;
@@ -499,19 +499,19 @@ DROP TABLE t1;
 # BUG#36104 - INFORMATION_SCHEMA.TABLES shows TRANSACTIONAL=1 twice in
 # CREATE_OPTIONS
 #
-create table t1(a int) engine=maria transactional=1;
+create table t1(a int) engine=aria transactional=1;
 select CREATE_OPTIONS from information_schema.TABLES where
 TABLE_SCHEMA='test' and TABLE_NAME='t1';
 drop table t1;
 
 #
-# BUG#39697 - Maria: hang when failing to insert due to UNIQUE
+# BUG#39697 - Aria: hang when failing to insert due to UNIQUE
 #
-create table t1 (a int, unique(a)) engine=maria transactional=1;
+create table t1 (a int, unique(a)) engine=aria transactional=1;
 insert into t1 values(1);
 --error 1062
 insert into t1 values(2),(2);
-create table t2 (a int, unique(a)) engine=maria transactional=0 row_format=dynamic;
+create table t2 (a int, unique(a)) engine=aria transactional=0 row_format=dynamic;
 insert into t2 values(1);
 --error 1062
 insert into t2 values(2),(2);
@@ -527,7 +527,7 @@ drop table t1, t2;
 --disable_result_log
 --disable_query_log
 eval set global storage_engine=$default_engine,
-maria_page_checksum=$default_checksum,
-maria_log_file_size=$default_log_file_size;
+aria_page_checksum=$default_checksum,
+aria_log_file_size=$default_log_file_size;
 --enable_result_log
 --enable_query_log