database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mashka.mysql.fi:/home/my/mysql-4.1


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2003-03-27 14:17:51 +02:00
parent 34559e8038 3ce463ec16
commit 837caf4ed5
65 changed files with 673 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/sql_parse.cc
View File

@@ -3420,21 +3420,29 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
lex->col_list.empty();
}
if (default_value && default_value->type() == Item::NULL_ITEM)
if (default_value)
{
if ((type_modifier & (NOT_NULL_FLAG | AUTO_INCREMENT_FLAG)) ==
NOT_NULL_FLAG)
if (default_value->type() == Item::NULL_ITEM)
{
net_printf(thd,ER_INVALID_DEFAULT,field_name);
default_value=0;
if ((type_modifier & (NOT_NULL_FLAG | AUTO_INCREMENT_FLAG)) ==
NOT_NULL_FLAG)
{
net_printf(thd,ER_INVALID_DEFAULT,field_name);
DBUG_RETURN(1);
}
}
else if (type_modifier & AUTO_INCREMENT_FLAG)
{
net_printf(thd, ER_INVALID_DEFAULT, field_name);
DBUG_RETURN(1);
}
default_value=0;
}
if (!(new_field=new create_field()))
DBUG_RETURN(1);
new_field->field=0;
new_field->field_name=field_name;
new_field->def= (type_modifier & AUTO_INCREMENT_FLAG ? 0 : default_value);
new_field->def= default_value;
new_field->flags= type_modifier;
new_field->unireg_check= (type_modifier & AUTO_INCREMENT_FLAG ?
Field::NEXT_NUMBER : Field::NONE);