diff options
| author | unknown <evgen@moonbone.local> | 2006-07-18 23:45:17 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2006-07-18 23:45:17 +0400 |
| commit | dc50ce997083b4f3d3e4ab237c6a1f5e11cfd90f (patch) | |
| tree | a7cde77bb894ad2fe7efa42cf6785616d7604353 /sql/item_strfunc.cc | |
| parent | ec40f4a588faa4b759816fd619929088b0723c24 (diff) | |
| parent | 7c7396cee5e8f88763a7b3468f4ae3f543195cf2 (diff) | |
| download | mariadb-git-dc50ce997083b4f3d3e4ab237c6a1f5e11cfd90f.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
client/mysql.cc:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/time.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index c03f360271f..5ceb462385c 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1041,7 +1041,7 @@ String *Item_func_left::val_str(String *str) long length =(long) args[1]->val_int(); uint char_pos; - if ((null_value=args[0]->null_value)) + if ((null_value=(args[0]->null_value || args[1]->null_value))) return 0; if (length <= 0) return &my_empty_string; @@ -1081,7 +1081,7 @@ String *Item_func_right::val_str(String *str) String *res =args[0]->val_str(str); long length =(long) args[1]->val_int(); - if ((null_value=args[0]->null_value)) + if ((null_value=(args[0]->null_value || args[1]->null_value))) return 0; /* purecov: inspected */ if (length <= 0) return &my_empty_string; /* purecov: inspected */ |