Skip to content

Commit f867c2a

Browse files
svojvuvova
authored andcommitted
Disabled high-level indexes with Aria
... until a few bugs that cause server crash are fixed.
1 parent 97b2392 commit f867c2a

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

mysql-test/main/vector2.result

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Aria doesn't support VECTOR yet
2+
create table t1(v blob not null, vector index(v)) engine=aria;
3+
ERROR HY000: Table storage engine 'Aria' does not support the create option 'VECTOR'

mysql-test/main/vector2.test

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#
2+
# tests that don't need to be run on many engines
3+
#
4+
5+
--echo # Aria doesn't support VECTOR yet
6+
--error ER_ILLEGAL_HA_CREATE_OPTION
7+
create table t1(v blob not null, vector index(v)) engine=aria;

storage/maria/ha_maria.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3317,6 +3317,11 @@ int ha_maria::create(const char *name, TABLE *table_arg,
33173317
THD *thd= current_thd;
33183318
DBUG_ENTER("ha_maria::create");
33193319

3320+
if (share->total_keys > share->keys)
3321+
{
3322+
my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0), "Aria", "VECTOR");
3323+
DBUG_RETURN(HA_ERR_UNSUPPORTED);
3324+
}
33203325
for (i= 0; i < share->keys; i++)
33213326
{
33223327
if (table_arg->key_info[i].flags & HA_USES_PARSER)

0 commit comments

Comments
 (0)