diff options
| author | unknown <serg@serg.mylan> | 2003-08-07 13:40:26 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-08-07 13:40:26 +0200 |
| commit | a2afee06dd24be31ffa91620a3f2a31759516857 (patch) | |
| tree | df9c5cb860db4cd3b4f1cf18bc353de85d192a9f | |
| parent | bb9568e092f82b67a615615239cb9810b45fc0b6 (diff) | |
| parent | 2b29fc927102c0b46d39fb302fcc2966390430b6 (diff) | |
| download | mariadb-git-a2afee06dd24be31ffa91620a3f2a31759516857.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index cf430aec35d..c55015f7aa5 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -602,13 +602,14 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, sql_field->flags|= NOT_NULL_FLAG; sql_field->pack_flag&= ~FIELDFLAG_MAYBE_NULL; } + else + key_info->flags|= HA_NULL_PART_KEY; if (!(file->table_flags() & HA_NULL_KEY)) { my_printf_error(ER_NULL_COLUMN_IN_INDEX,ER(ER_NULL_COLUMN_IN_INDEX), MYF(0),column->field_name); DBUG_RETURN(-1); } - key_info->flags|= HA_NULL_PART_KEY; } if (MTYP_TYPENR(sql_field->unireg_check) == Field::NEXT_NUMBER) { |