diff options
author | Michael Widenius <monty@askmonty.org> | 2013-05-21 22:00:08 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2013-05-21 22:00:08 +0300 |
commit | 3143ad589a24ac7581e2195ba0dc13576cb3c9da (patch) | |
tree | 9c02baa18cdca6f60d80e2f7ee7f3f792c293ab9 /storage/sphinx | |
parent | 068c61978e3a81836d52b8caf11e044290159ad1 (diff) | |
download | mariadb-git-3143ad589a24ac7581e2195ba0dc13576cb3c9da.tar.gz |
Push a lot of small fixes to get larger parts to compile
Diffstat (limited to 'storage/sphinx')
-rw-r--r-- | storage/sphinx/ha_sphinx.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc index 3305875c124..7c991b7e518 100644 --- a/storage/sphinx/ha_sphinx.cc +++ b/storage/sphinx/ha_sphinx.cc @@ -3375,7 +3375,7 @@ int ha_sphinx::create ( const char * name, TABLE * table, HA_CREATE_INFO * ) // check index if ( table->s->keys!=1 || - table->key_info[0].key_parts!=1 || + table->key_info[0].user_defined_key_parts != 1 || strcasecmp ( table->key_info[0].key_part[0].field->field_name, table->field[2]->field_name ) ) { my_snprintf ( sError, sizeof(sError), "%s: there must be an index on '%s' column", @@ -3409,7 +3409,7 @@ int ha_sphinx::create ( const char * name, TABLE * table, HA_CREATE_INFO * ) // check index if ( table->s->keys!=1 || - table->key_info[0].key_parts!=1 || + table->key_info[0].user_defined_key_parts!=1 || strcasecmp ( table->key_info[0].key_part[0].field->field_name, "id" ) ) { my_snprintf ( sError, sizeof(sError), "%s: 'id' column must be indexed", name ); |