diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-10-30 16:21:17 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-10-30 16:21:17 +0200 |
| commit | abdb052bae619338ee233a6118e39b274d0bd3e8 (patch) | |
| tree | 97ca23ec7ff3ccf148970f5bcf2935d772b8b9f9 /sql/item_subselect.h | |
| parent | f97b8e48b8f6ec290f7cc7ca3fe59c33f7cb0d9e (diff) | |
| parent | 6bbdacae209a1916bdb4d4d4f418d25cb6142d2b (diff) | |
| download | mariadb-git-abdb052bae619338ee233a6118e39b274d0bd3e8.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B31884-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B31884-5.1-opt
sql/item_subselect.h:
Auto merged
mysql-test/r/subselect.result:
merged the fix for bug 31884 to 5.1-opt
mysql-test/t/subselect.test:
merged the fix for bug 31884 to 5.1-opt
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index 51ab7b8ad42..de4b1cbdc06 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -307,6 +307,7 @@ public: double val_real(); String *val_str(String*); my_decimal *val_decimal(my_decimal *); + void update_null_value () { (void) val_bool(); } bool val_bool(); void top_level_item() { abort_on_null=1; } inline bool is_top_level_item() { return abort_on_null; } |