diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-09-15 11:00:35 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-09-15 11:00:35 -0600 |
| commit | f1f2ffcd0f45a957af217413c87eb4061e480692 (patch) | |
| tree | 993dd4ef4b73bf6fb7507f208aa766bc528400e9 /sql/sql_table.cc | |
| parent | 845fd45a21fd9e8de5cd39f4c65b6d1b9c1396e9 (diff) | |
| parent | 5ed90531405b116444d1f3443369f1a6b1a2c2b4 (diff) | |
| download | mariadb-git-f1f2ffcd0f45a957af217413c87eb4061e480692.tar.gz | |
merge of conflicts
sql/ha_myisam.h:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index d83e4c2e7f0..4f770ed53d4 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -176,7 +176,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, DBUG_ENTER("mysql_create_table"); /* - ** Check for dupplicate fields and check type of table to create + ** Check for duplicate fields and check type of table to create */ if (!fields.elements) @@ -302,7 +302,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, bool primary_key=0,unique_key=0; Key *key; uint tmp; - tmp=max(file->max_keys(), MAX_KEY); + tmp=min(file->max_keys(), MAX_KEY); if (key_count > tmp) { |