diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-17 18:02:56 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-17 18:02:56 +0300 |
| commit | 36827564d3d8d6f18e13d79bebed75572c21f769 (patch) | |
| tree | cb6c69dea958c68e0dfee4737f5b9a8f63b37aee /sql/item_cmpfunc.cc | |
| parent | c9bda5bc7efdd888f4388f1ae9235091fcd5f03a (diff) | |
| download | mariadb-git-36827564d3d8d6f18e13d79bebed75572c21f769.tar.gz | |
Portability fixes for 4.0.3 build.
Don't update MyISAM index file on UPDATE if index is not changed
Build-tools/Do-compile:
Remove log files as early as possible
Docs/manual.texi:
Changelog
BitKeeper/etc/ignore:
Added myisam/test2.MYD myisam/test2.MYI to the ignore list
include/my_semaphore.h:
Portability fix for SCO and BSDI
innobase/configure.in:
Don't use inline with openbsd as this cases linker problems.
myisam/mi_update.c:
Don't update index file on UPDATE if index is not changed
mysys/my_pthread.c:
Portability fix for hpux
sql/item_cmpfunc.cc:
Don't convert bigint to bigint
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index e5544bc7bc2..923bbccde24 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -37,10 +37,16 @@ longlong Item_func_not::val_int() return !null_value && value == 0 ? 1 : 0; } +/* + Convert a constant expression or string to an integer. + This is done when comparing DATE's of different formats and + also when comparing bigint to strings (in which case the string + is converted once to a bigint). +*/ static bool convert_constant_item(Field *field, Item **item) { - if ((*item)->const_item()) + if ((*item)->const_item() && (*item)->type() != Item::INT_ITEM) { if (!(*item)->save_in_field(field) && !((*item)->null_value)) |