diff options
author | unknown <jimw@mysql.com> | 2005-03-03 15:01:46 -0800 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-03-03 15:01:46 -0800 |
commit | daaeeedb499cd27ff0279d8321808cdbccdd7e09 (patch) | |
tree | d9fcf7c0806dd22a5d3dc0996b6c7b4ff240cbb9 /sql/item.h | |
parent | 80b474bfc0c77ae2a4b477b15ac6681b05d33e6d (diff) | |
parent | 92895d00527f62a57ed569f85df01dbf4f0db9c3 (diff) | |
download | mariadb-git-daaeeedb499cd27ff0279d8321808cdbccdd7e09.tar.gz |
Merged from 4.1
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
sql/item.h:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
mysql-test/r/grant2.result:
Hand-merged new test
mysql-test/t/grant2.test:
Hand-merged new test
ndb/include/ndbapi/NdbTransaction.hpp:
Used 5.0 version per tomas
sql/sql_acl.cc:
Merge fix for Bug #3309.
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index ca69af39f62..157c48393ba 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1242,6 +1242,8 @@ public: The following class is used to optimize comparing of date and bigint columns We need to save the original item, to be able to set the field to the original value in 'opt_range'. + An instance of Item_int_with_ref may refer to a signed or an unsigned + integer. */ class Item_int_with_ref :public Item_int @@ -1256,6 +1258,11 @@ public: { return ref->save_in_field(field, no_conversions); } + Item *new_item() + { + return (ref->unsigned_flag)? new Item_uint(ref->name, ref->max_length) : + new Item_int(ref->name, ref->max_length); + } }; |