diff options
| author | unknown <igor@rurik.mysql.com> | 2006-06-02 17:06:10 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-06-02 17:06:10 -0700 |
| commit | 5fd2a3503203ac8263861f25fa80ac5f538b908d (patch) | |
| tree | 15bc7fdfa17f8a8f8f09eda2d7b1452ec5985783 /sql/sql_select.cc | |
| parent | cbbd0fdb2c14984e8abf5f9dc8ee8280eda367a9 (diff) | |
| parent | ccad0572f5c7a20d909785732995984de9d76552 (diff) | |
| download | mariadb-git-5fd2a3503203ac8263861f25fa80ac5f538b908d.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt
sql/opt_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
mysql-test/r/func_group.result:
SCCS merged
mysql-test/t/func_group.test:
SCCS merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 505beedac3e..96b196e34b0 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4788,7 +4788,7 @@ get_store_key(THD *thd, KEYUSE *keyuse, table_map used_tables, */ bool -store_val_in_field(Field *field,Item *item) +store_val_in_field(Field *field, Item *item, enum_check_fields check_flag) { bool error; THD *thd= field->table->in_use; @@ -4799,7 +4799,7 @@ store_val_in_field(Field *field,Item *item) with select_insert, which make count_cuted_fields= 1 */ enum_check_fields old_count_cuted_fields= thd->count_cuted_fields; - thd->count_cuted_fields= CHECK_FIELD_WARN; + thd->count_cuted_fields= check_flag; error= item->save_in_field(field, 1); thd->count_cuted_fields= old_count_cuted_fields; return error || cuted_fields != thd->cuted_fields; @@ -10928,7 +10928,7 @@ static bool test_if_ref(Item_field *left_item,Item *right_item) field->real_type() != MYSQL_TYPE_VARCHAR && (field->type() != FIELD_TYPE_FLOAT || field->decimals() == 0)) { - return !store_val_in_field(field,right_item); + return !store_val_in_field(field, right_item, CHECK_FIELD_WARN); } } } |