summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <monty@work.mysql.com>2001-09-02 20:13:07 +0200
committerunknown <monty@work.mysql.com>2001-09-02 20:13:07 +0200
commitbbf281185cbd48fa4b0315fa208b638a11da06e8 (patch)
tree13764f67c4bd995d05603d7061d33b11ddcdb100 /myisam
parentddee00a6edc735b3bbef42b7d0d662091debd560 (diff)
parent76ec780f0e731b297a487333c6a297456b6cd0c1 (diff)
downloadmariadb-git-bbf281185cbd48fa4b0315fa208b638a11da06e8.tar.gz
merge
configure.in: Auto merged Docs/manual.texi: Auto merged myisam/mi_create.c: Auto merged
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_create.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_create.c b/myisam/mi_create.c
index d3e5e819742..7033cd59639 100644
--- a/myisam/mi_create.c
+++ b/myisam/mi_create.c
@@ -64,7 +64,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
ci=&tmp_create_info;
}
- if (keys + uniques > MI_MAX_KEY)
+ if (keys + uniques > MI_MAX_KEY || columns == 0)
{
DBUG_RETURN(my_errno=HA_WRONG_CREATE_OPTION);
}