diff options
| author | unknown <jani@rhols221.adsl.netsonic.fi> | 2003-03-23 11:30:45 +0200 |
|---|---|---|
| committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2003-03-23 11:30:45 +0200 |
| commit | fd8972cfa738af8f18f34f5bcd6b7f8d82e3b9f5 (patch) | |
| tree | 34a1af297b2f3e9cbe5ac174ff602a5469b05d0b /sql | |
| parent | c1719ad057d0bfa3bc4a40d01c604193c91a5659 (diff) | |
| download | mariadb-git-fd8972cfa738af8f18f34f5bcd6b7f8d82e3b9f5.tar.gz | |
Reverted fix away from 4.0, because it may in rare circumstanses
cause compatibility problems. Fix will be enabled in 4.1.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index e861aef5fe7..ad7ccaf8f38 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2892,17 +2892,23 @@ bool add_field_to_list(char *field_name, enum_field_types type, DBUG_RETURN(1); } } +#ifdef MYSQL41000 else if (type_modifier & AUTO_INCREMENT_FLAG) { net_printf(&thd->net, ER_INVALID_DEFAULT, field_name); DBUG_RETURN(1); } +#endif } if (!(new_field=new create_field())) DBUG_RETURN(1); new_field->field=0; new_field->field_name=field_name; +#ifdef MYSQL41000 new_field->def= default_value; +#else + new_field->def= (type_modifier & AUTO_INCREMENT_FLAG ? 0 : default_value); +#endif new_field->flags= type_modifier; new_field->unireg_check= (type_modifier & AUTO_INCREMENT_FLAG ? Field::NEXT_NUMBER : Field::NONE); |