diff options
author | unknown <holyfoot@mysql.com> | 2006-03-02 09:17:11 +0400 |
---|---|---|
committer | unknown <holyfoot@mysql.com> | 2006-03-02 09:17:11 +0400 |
commit | 6513ddab4d9ba5ffd4d45be447eaa87d60b481ea (patch) | |
tree | 49f69c05faad4037bd4f764ab3492c5bad48cf31 /sql/item_cmpfunc.cc | |
parent | 605c82d2a8502d4114a0ab1768ccf894903699e6 (diff) | |
parent | b17bb278f760bdd646192eb6bff51ea5ad5c3975 (diff) | |
download | mariadb-git-6513ddab4d9ba5ffd4d45be447eaa87d60b481ea.tar.gz |
Merge mysql.com:/home/hf/work/mysql-5.0.9088
into mysql.com:/home/hf/work/mysql-5.1.mrg
mysql-test/r/bigint.result:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 2014f646356..592b7e9dc6c 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -216,7 +216,8 @@ static bool convert_constant_item(THD *thd, Field *field, Item **item) field->table->in_use->variables.sql_mode|= MODE_INVALID_DATES; if (!(*item)->save_in_field(field, 1) && !((*item)->null_value)) { - Item *tmp=new Item_int_with_ref(field->val_int(), *item); + Item *tmp=new Item_int_with_ref(field->val_int(), *item, + test(field->flags & UNSIGNED_FLAG)); field->table->in_use->variables.sql_mode= orig_sql_mode; if (tmp) thd->change_item_tree(item, tmp); |