summaryrefslogtreecommitdiff
path: root/sql/sql_analyse.cc
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2008-03-21 17:26:18 +0200
committerunknown <gkodinov/kgeorge@magare.gmz>2008-03-21 17:26:18 +0200
commita3558b5f84e77adf35cf908664bdef3cd9eeb136 (patch)
tree7708331f9232d2142a317440a91af7e5a02b6be7 /sql/sql_analyse.cc
parent070a233415bad1363758dfc9a579f3834ead92be (diff)
parentcebb6727b3c8593283f81182d06c45ca69cc0304 (diff)
downloadmariadb-git-a3558b5f84e77adf35cf908664bdef3cd9eeb136.tar.gz
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
Diffstat (limited to 'sql/sql_analyse.cc')
-rw-r--r--sql/sql_analyse.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 95a7fb3d34d..2e90d00f8aa 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -683,7 +683,7 @@ int analyse::send_row(List<Item> &field_list __attribute__((unused)))
} // analyse::send_row
-bool analyse::end_of_records()
+int analyse::end_of_records()
{
field_info **f = f_info;
char buff[MAX_FIELD_WIDTH];