diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-07 09:11:56 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-12-07 09:11:56 +0400 |
| commit | 7341315d7404d1a79d9fad85d8b0aad6855b88b5 (patch) | |
| tree | 04b6463e3f9a0e6021b4db1fce2eb3c1b9f9e8ec /sql | |
| parent | 8f3c395c260f40c519444441297b979a5f09f6bf (diff) | |
| download | mariadb-git-7341315d7404d1a79d9fad85d8b0aad6855b88b5.tar.gz | |
merging
mysql-test/r/gis.result:
result fixed
sql/field.cc:
Field_*::reset() now returns int
sql/sql_load.cc:
merging fix
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 3 | ||||
| -rw-r--r-- | sql/sql_load.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index f1896344349..590246c51b2 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -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; } diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 093e88bf82f..018db006276 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -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); } |