diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-21 17:48:28 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-21 17:48:28 +0200 |
| commit | 1b6118190ef30d4211609e284d164873f11c8688 (patch) | |
| tree | 4f0c113cf15f0425c7fedd53da1c81aa881a00ea /sql/sql_analyse.h | |
| parent | 6c61454bcd01aaa59bfb991824f96fd3358b05ad (diff) | |
| parent | a3558b5f84e77adf35cf908664bdef3cd9eeb136 (diff) | |
| download | mariadb-git-1b6118190ef30d4211609e284d164873f11c8688.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
CMakeLists.txt:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
sql/procedure.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_analyse.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/handler.h:
merged bug 26461 to 5.1-opt
sql/mysql_priv.h:
merged bug 26461 to 5.1-opt
sql/sql_base.cc:
merged bug 26461 to 5.1-opt
sql/sql_prepare.cc:
merged bug 26461 to 5.1-opt
Diffstat (limited to 'sql/sql_analyse.h')
| -rw-r--r-- | sql/sql_analyse.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_analyse.h b/sql/sql_analyse.h index 827b6f4b217..8807b40857e 100644 --- a/sql/sql_analyse.h +++ b/sql/sql_analyse.h @@ -350,7 +350,7 @@ public: virtual bool change_columns(List<Item> &fields); virtual int send_row(List<Item> &field_list); virtual void end_group(void) {} - virtual bool end_of_records(void); + virtual int end_of_records(void); friend Procedure *proc_analyse_init(THD *thd, ORDER *param, select_result *result, List<Item> &field_list); |