mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
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
This commit is contained in:
@@ -682,7 +682,7 @@ int analyse::send_row(List<Item> & /* field_list */)
|
||||
} // analyse::send_row
|
||||
|
||||
|
||||
bool analyse::end_of_records()
|
||||
int analyse::end_of_records()
|
||||
{
|
||||
field_info **f = f_info;
|
||||
char buff[MAX_FIELD_WIDTH];
|
||||
|
||||
Reference in New Issue
Block a user