Commit 291fb19f authored by Sergey Vojtovich's avatar Sergey Vojtovich Committed by Sergei Golubchik

Disabled high-level indexes with Aria

... until a few bugs that cause server crash are fixed.
parent 8016248b
...@@ -851,3 +851,6 @@ drop table t1; ...@@ -851,3 +851,6 @@ drop table t1;
create table t1(v blob not null, vector index(v)); create table t1(v blob not null, vector index(v));
alter table t1 add column a int; alter table t1 add column a int;
drop table t1; drop table t1;
# Aria doesn't support VECTOR yet
create table t1(v blob not null, vector index(v)) engine=aria;
ERROR HY000: Table storage engine 'Aria' does not support the create option 'VECTOR'
...@@ -382,3 +382,7 @@ drop table t1; ...@@ -382,3 +382,7 @@ drop table t1;
create table t1(v blob not null, vector index(v)); create table t1(v blob not null, vector index(v));
alter table t1 add column a int; alter table t1 add column a int;
drop table t1; drop table t1;
--echo # Aria doesn't support VECTOR yet
--error ER_ILLEGAL_HA_CREATE_OPTION
create table t1(v blob not null, vector index(v)) engine=aria;
...@@ -3317,6 +3317,11 @@ int ha_maria::create(const char *name, TABLE *table_arg, ...@@ -3317,6 +3317,11 @@ int ha_maria::create(const char *name, TABLE *table_arg,
THD *thd= current_thd; THD *thd= current_thd;
DBUG_ENTER("ha_maria::create"); DBUG_ENTER("ha_maria::create");
if (share->total_keys > share->keys)
{
my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0), "Aria", "VECTOR");
DBUG_RETURN(HA_ERR_UNSUPPORTED);
}
for (i= 0; i < share->keys; i++) for (i= 0; i < share->keys; i++)
{ {
if (table_arg->key_info[i].flags & HA_USES_PARSER) if (table_arg->key_info[i].flags & HA_USES_PARSER)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment