summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria/r/maria2.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-09-12 18:40:01 +0200
committerSergei Golubchik <sergii@pisem.net>2010-09-12 18:40:01 +0200
commite246077bcf5fc22a381ee8591a441eb345a4a2af (patch)
tree0c1a6ec6c3f3ab37645d71f9b0dae45e2083f543 /mysql-test/suite/maria/r/maria2.result
parentfa5baa12bcd1d1a152d358f2bb8e1f6e17590d46 (diff)
downloadmariadb-git-e246077bcf5fc22a381ee8591a441eb345a4a2af.tar.gz
rename maria to aria
Diffstat (limited to 'mysql-test/suite/maria/r/maria2.result')
-rw-r--r--mysql-test/suite/maria/r/maria2.result10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/maria/r/maria2.result b/mysql-test/suite/maria/r/maria2.result
index e721ceaafae..f145a4884e7 100644
--- a/mysql-test/suite/maria/r/maria2.result
+++ b/mysql-test/suite/maria/r/maria2.result
@@ -3,7 +3,7 @@ CREATE TABLE t1 (
line BLOB,
kind ENUM('po', 'pp', 'rr', 'dr', 'rd', 'ts', 'cl') NOT NULL DEFAULT 'po',
name VARCHAR(32)
-) transactional=0 row_format=page engine=maria;
+) transactional=0 row_format=page engine=aria;
select count(*) from t1;
count(*)
810
@@ -17,8 +17,8 @@ check table t1 extended;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1;
-create table t1 (i int) engine=maria;
-create table t2 (j int) engine=maria;
+create table t1 (i int) engine=aria;
+create table t2 (j int) engine=aria;
lock table t1 write, t2 read;
alter table t1 modify i int default 1;
insert into t1 values (2);
@@ -30,7 +30,7 @@ select * from t1;
i
2
drop table t1,t2;
-create table t1(id int, s char(1), unique(s)) engine=maria;
+create table t1(id int, s char(1), unique(s)) engine=aria;
insert into t1 values(1,"a") on duplicate key update t1.id=t1.id+1;
insert into t1 values(1,"a") on duplicate key update t1.id=t1.id+1;
insert into t1 select 1,"a" on duplicate key update t1.id=t1.id+1;
@@ -42,7 +42,7 @@ select * from t1;
id s
1 a
drop table t1;
-create table t1 (pk int primary key, apk int unique, data int) engine=maria;
+create table t1 (pk int primary key, apk int unique, data int) engine=aria;
insert into t1 values (1, 1, 1), (4, 4, 4), (6, 6, 6);
load data concurrent infile '../../std_data/loaddata5.dat' replace into table t1 fields terminated by '' enclosed by '' ignore 1 lines (pk, apk);
select * from t1 order by pk;