diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-23 09:18:56 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-23 09:18:56 +0200 |
| commit | 129300f13dbc77d77c0f25aebcf70e209041c609 (patch) | |
| tree | c8bd72147c7a879a6bd64b822d50e5b84a315c56 /sql/item_sum.cc | |
| parent | abda6dc69fa6d1fb75cf5754eb71edd10baae12c (diff) | |
| parent | 727f0b8a1f2fdc3f458f6b5da5ebe3cc73620403 (diff) | |
| download | mariadb-git-129300f13dbc77d77c0f25aebcf70e209041c609.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysqltest.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/func_group.result:
Manual merge
mysql-test/r/loaddata.result:
Manual merge
mysql-test/r/type_decimal.result:
Manual merge
mysql-test/r/union.result:
Manual merge
sql/field_conv.cc:
aborting fix for 7589
sql/opt_sum.cc:
Manual merge
sql/sql_load.cc:
Manual merge
sql/sql_yacc.yy:
Aborting fix for 11553
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 880ab4c8cb1..3129ce5db45 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1367,8 +1367,8 @@ void Item_sum_hybrid::cleanup() void Item_sum_hybrid::no_rows_in_result() { - Item_sum::no_rows_in_result(); was_values= FALSE; + clear(); } |