diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-22 09:51:20 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-22 09:51:20 +0300 |
| commit | 93678f6bd9be1d320a63ae3fcf24493dae065ae7 (patch) | |
| tree | 63ed1b249c904afc7cd4046b592b8cb55cbacef8 /sql/sql_select.h | |
| parent | 485141ce7a6d34e2cf59eb5bf115d6941795043e (diff) | |
| parent | 0a929c5e6eb5042400a154fc01cae524f7d2e0a5 (diff) | |
| download | mariadb-git-93678f6bd9be1d320a63ae3fcf24493dae065ae7.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_row.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index d489e911363..05ab148764d 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -333,7 +333,7 @@ class JOIN :public Sql_alloc return (do_send_rows && tmp_table_param.sum_func_count != 0 && !group_list); } - int change_result(select_result *result); + bool change_result(select_result *result); }; |