mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

merging

Browse source 
mysql-test/r/gis.result:
  result fixed
sql/field.cc:
  Field_*::reset() now returns int
sql/sql_load.cc:
  merging fix
This commit is contained in:
unknown 2006-12-07 09:11:56 +04:00
commit 7341315d74
3 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sql/field.cc
View file

@ -2218,9 +2218,10 @@ Field_new_decimal::Field_new_decimal(uint32 len_arg,
}
void Field_new_decimal::reset(void)
int Field_new_decimal::reset(void)
{
store_value(&decimal_zero);
return 0;
}

2
sql/sql_load.cc
View file

@ -753,7 +753,7 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
Field *field= ((Item_field *)item)->field;
if (field->reset())
{
my_error(ER_WARN_NULL_TO_NOTNULL, MYF(0),sql_field->field->field_name,
my_error(ER_WARN_NULL_TO_NOTNULL, MYF(0),field->field_name,
thd->row_count);
DBUG_RETURN(1);
}