summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-05-22 18:51:21 +0300
committermonty@hundin.mysql.fi <>2002-05-22 18:51:21 +0300
commite013efcc120783438de44fcbe4ad4e006fa27d1b (patch)
treee6741f4cc08ecfcebdfc62b6fab6d6b0e1a7e453 /sql/sql_table.cc
parent3b43cb2960b2f44b78d63fe94b249ff52da9d3c4 (diff)
downloadmariadb-git-e013efcc120783438de44fcbe4ad4e006fa27d1b.tar.gz
Fixed problem in fulltest testcase
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc20
1 files changed, 11 insertions, 9 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 36c4f4cba48..bdcb325774b 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -476,20 +476,22 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
checking for proper key parts number:
*/
- if(key_info->flags == HA_SPATIAL){
- if(key_info->key_parts!=1){
+ if (key_info->flags == HA_SPATIAL)
+ {
+ if (key_info->key_parts != 1)
+ {
my_printf_error(ER_WRONG_ARGUMENTS,
ER(ER_WRONG_ARGUMENTS),MYF(0),"SPATIAL INDEX");
DBUG_RETURN(-1);
}
- }else
+ }
+ else if (key_info->algorithm == HA_KEY_ALG_RTREE)
{
- if(key_info->algorithm == HA_KEY_ALG_RTREE){
- if((key_info->key_parts&1)==1){
- my_printf_error(ER_WRONG_ARGUMENTS,
- ER(ER_WRONG_ARGUMENTS),MYF(0),"RTREE INDEX");
- DBUG_RETURN(-1);
- }
+ if ((key_info->key_parts & 1) == 1)
+ {
+ my_printf_error(ER_WRONG_ARGUMENTS,
+ ER(ER_WRONG_ARGUMENTS),MYF(0),"RTREE INDEX");
+ DBUG_RETURN(-1);
}
}