diff options
| author | unknown <jani@hynda.(none)> | 2003-05-13 22:34:04 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.(none)> | 2003-05-13 22:34:04 +0300 |
| commit | 1e99e9fe96ceefc2b137bcf114f43be5bb3ce336 (patch) | |
| tree | 7fd65f6df0f3c3a56cd5c68b1b6188c6cde2465d /sql | |
| parent | 32450d159b685660add0d2f68bc9d3a24b6bfb52 (diff) | |
| parent | 517bbaceeef0e488d39f1d8e689748cc7d50262c (diff) | |
| download | mariadb-git-1e99e9fe96ceefc2b137bcf114f43be5bb3ce336.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into hynda.(none):/home/my/bk/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_table.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 745d9ea1084..90239c1c7ea 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -598,8 +598,9 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, { if (key->type == Key::PRIMARY) { - my_error(ER_PRIMARY_CANT_HAVE_NULL, MYF(0)); - DBUG_RETURN(-1); + /* Implicitly set primary key fields to NOT NULL for ISO conf. */ + sql_field->flags|= NOT_NULL_FLAG; + sql_field->pack_flag&= ~FIELDFLAG_MAYBE_NULL; } if (!(file->table_flags() & HA_NULL_KEY)) { |