database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Resolving of conflicts from pull

Browse Source
This commit is contained in:
hf@bison.(none)
2002-06-17 17:14:20 +05:00
parent 67c06bf63a 9ba0b3bc21
commit cc6407f1a5
17 changed files with 640 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.cc
View File

@@ -386,6 +386,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)
@@ -414,6 +416,7 @@ bool select_send::send_data(List<Item> &items)
bool error=my_net_write(&thd->net,(char*) packet->ptr(),packet->length());
DBUG_RETURN(error);
}
#endif /* EMBEDDED_LIBRARY */
bool select_send::send_eof()
{