database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Pull conflicts resolutions

Browse Source
This commit is contained in:
hf@genie.(none)
2002-11-29 12:35:48 +04:00
parent e1cb867968 25bd1e9a37
commit 5e8b27c0d3
27 changed files with 1785 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.cc
View File

@ -508,6 +508,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)
@ -542,6 +544,7 @@ bool select_send::send_data(List<Item> &items)
else
DBUG_RETURN(1);
}
#endif /* EMBEDDED_LIBRARY */
bool select_send::send_eof()
{