diff options
| author | unknown <monty@mysql.com> | 2004-03-30 02:32:41 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-30 02:32:41 +0300 |
| commit | ceeaa24d187b228fd6e8b1ac1e667d341155640f (patch) | |
| tree | 54b32bf1935af765ea1bb9b118082d9ce067d4c0 /sql/item_cmpfunc.cc | |
| parent | db9fde085fdbdacd48760c0243805e8df8b39a8c (diff) | |
| download | mariadb-git-ceeaa24d187b228fd6e8b1ac1e667d341155640f.tar.gz | |
false/true -> FALSE/TRUE
Fixes after last merge
mysql-test/r/bdb-crash.result:
fixed bad merge
mysql-test/r/myisam.result:
after merge fix
mysql-test/r/order_by.result:
fixed bad merge
mysql-test/t/order_by.test:
after merge fix
sql/field_conv.cc:
false/true -> FALSE/TRUE
sql/handler.cc:
false/true -> FALSE/TRUE
sql/item.cc:
false/true -> FALSE/TRUE
sql/item_cmpfunc.cc:
false/true -> FALSE/TRUE
sql/item_sum.cc:
false/true -> FALSE/TRUE
sql/slave.cc:
false/true -> FALSE/TRUE
sql/sql_acl.cc:
false/true -> FALSE/TRUE
sql/sql_cache.cc:
after merge fix
sql/sql_help.cc:
false/true -> FALSE/TRUE
sql/sql_olap.cc:
false/true -> FALSE/TRUE
sql/sql_parse.cc:
false/true -> FALSE/TRUE
sql/sql_select.cc:
fix after bad merge
sql/sql_table.cc:
fix after bad merge
sql/sql_test.cc:
false/true -> FALSE/TRUE
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 9175f12a60c..24d60b51eab 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -770,11 +770,13 @@ longlong Item_func_between::val_int() null_value=1; else if (args[1]->null_value) { - null_value= sortcmp(value,b,cmp_collation.collation) <= 0; // not null if false range. + // Set to not null if false range. + null_value= sortcmp(value,b,cmp_collation.collation) <= 0; } else { - null_value= sortcmp(value,a,cmp_collation.collation) >= 0; // not null if false range. + // Set to not null if false range. + null_value= sortcmp(value,a,cmp_collation.collation) >= 0; } } else if (cmp_type == INT_RESULT) |