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.
This commit is contained in:
Michael Widenius 2010-08-02 12:22:36 +03:00
parent e0a6b02c5d
commit 8cacc59e8f
4 changed files with 18 additions and 0 deletions

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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}
};