From 8cacc59e8f7bca1f931f12bbc0315c7c4b5b4a5f Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Mon, 2 Aug 2010 12:22:36 +0300
Subject: [PATCH] Disable some tests that is waiting for next merge with xtradb
 Added 'Aria' as an alias for the Maria storage engine. Real rename is
 happening in 5.2

sql/handler.cc:
  Added 'Aria' as an alias for the Maria storage engine.
---
 mysql-test/suite/innodb/t/disabled.def | 2 ++
 mysql-test/suite/maria/r/maria.result  | 7 +++++++
 mysql-test/suite/maria/t/maria.test    | 8 ++++++++
 sql/handler.cc                         | 1 +
 4 files changed, 18 insertions(+)

diff --git a/mysql-test/suite/innodb/t/disabled.def b/mysql-test/suite/innodb/t/disabled.def
index 6e475d18211..90c9bc5b38e 100644
--- a/mysql-test/suite/innodb/t/disabled.def
+++ b/mysql-test/suite/innodb/t/disabled.def
@@ -14,3 +14,5 @@ innodb : Bug#53306 2010-04-30 VasilDimov valgrind warnings
 innodb_bug52663 : Waiting for merge with XtraDB
 innodb_bug51920 : Waiting for merge with XtraDB
 innodb_bug48024 : Waiting for merge with XtraDB
+innodb_bug49164 : Waiting for merge with XtraDB
+innodb_bug54044 : Waiting for merge with XtraDB
diff --git a/mysql-test/suite/maria/r/maria.result b/mysql-test/suite/maria/r/maria.result
index 5e33c3fa423..5d7a5fec78b 100644
--- a/mysql-test/suite/maria/r/maria.result
+++ b/mysql-test/suite/maria/r/maria.result
@@ -2600,3 +2600,10 @@ check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
+Create table t1 (a int) engine="aria";
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL
+) ENGINE=MARIA DEFAULT CHARSET=latin1 PAGE_CHECKSUM=0
+drop table t1;
diff --git a/mysql-test/suite/maria/t/maria.test b/mysql-test/suite/maria/t/maria.test
index c40dde5952b..35ccb6263e3 100644
--- a/mysql-test/suite/maria/t/maria.test
+++ b/mysql-test/suite/maria/t/maria.test
@@ -1873,6 +1873,14 @@ insert into t1 values(1,repeat('a',100), repeat('b',657860));
 check table t1;
 drop table t1;
 
+#
+# Check we can create a table with the 'Aria' alias
+#
+
+Create table t1 (a int) engine="aria";
+show create table t1;
+drop table t1;
+
 # Set defaults back
 --disable_result_log
 --disable_query_log
diff --git a/sql/handler.cc b/sql/handler.cc
index e455523d508..afd9d08971d 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -58,6 +58,7 @@ static const LEX_STRING sys_table_aliases[]=
   { C_STRING_WITH_LEN("NDB") },       { C_STRING_WITH_LEN("NDBCLUSTER") },
   { C_STRING_WITH_LEN("HEAP") },      { C_STRING_WITH_LEN("MEMORY") },
   { C_STRING_WITH_LEN("MERGE") },     { C_STRING_WITH_LEN("MRG_MYISAM") },
+  { C_STRING_WITH_LEN("Aria") },      { C_STRING_WITH_LEN("Maria") },
   {NullS, 0}
 };