diff options
| author | unknown <wax@mysql.com> | 2003-08-29 02:30:11 +0600 |
|---|---|---|
| committer | unknown <wax@mysql.com> | 2003-08-29 02:30:11 +0600 |
| commit | 0a371caf83820695bd906f5e3631b86a9c713950 (patch) | |
| tree | bbfdf77756faf14c22ce53db9efdd6fbed4deed6 /sql/item_sum.h | |
| parent | 0f57bb2eda7b76f7a5e8bb34b6f01084d84ab6d1 (diff) | |
| parent | 40156410f9d26e3d649d71aa2a005c5f933fa6e4 (diff) | |
| download | mariadb-git-0a371caf83820695bd906f5e3631b86a9c713950.tar.gz | |
Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1mm
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index e9f9890f41d..7dca0502cb0 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -733,4 +733,5 @@ class Item_func_group_concat : public Item_sum } String* val_str(String* str); Item *copy_or_same(THD* thd); + void no_rows_in_result() {} }; |