mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merged by hands
BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-skipkeys~207548ca813d5081: 'Auto converge rename' libmysqld/lib_sql.cc: Auto merged sql/field.h: Auto merged sql/ha_myisam.cc: Auto merged sql/item.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@ -463,6 +463,8 @@ bool select_send::send_fields(List<Item> &list,uint flag)
|
||||
}
|
||||
|
||||
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
|
||||
/* Send data to client. Returns 0 if ok */
|
||||
|
||||
bool select_send::send_data(List<Item> &items)
|
||||
@ -497,6 +499,7 @@ bool select_send::send_data(List<Item> &items)
|
||||
else
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
#endif /* EMBEDDED_LIBRARY */
|
||||
|
||||
bool select_send::send_eof()
|
||||
{
|
||||
|
Reference in New Issue
Block a user