diff options
| author | unknown <monty@mysql.com> | 2005-06-07 05:43:59 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-06-07 05:43:59 +0300 |
| commit | e90b64cda4466566db12969a3a40f614a97cc329 (patch) | |
| tree | 8f0373db205d942b25865102f9d3a220731a7851 /sql/item.cc | |
| parent | bd47a7df597db377aeaa95b6f47f4c24b26d16f0 (diff) | |
| download | mariadb-git-e90b64cda4466566db12969a3a40f614a97cc329.tar.gz | |
After merge fixes
mysql-test/r/innodb.result:
Update results
mysql-test/r/warnings.result:
Update results
sql/item.cc:
Simple optimization
sql/item_func.cc:
After merge fix
sql/item_sum.cc:
Fixes for group_concat and rollup (From Ramil)
sql/sql_parse.cc:
Remove compiler warning
sql/sql_select.cc:
Fixed problem with rollup
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 5f6fa6bd50f..680b771f908 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4414,8 +4414,7 @@ bool Item_direct_ref::val_bool() bool Item_direct_ref::is_null() { - (void) (*ref)->val_int(); - return (*ref)->null_value; + return (*ref)->is_null(); } |