database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Resolving of conflicts from pull

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/lib_vio.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/net_pkg.cc:
  Merging of pull conflicts
sql/sql_base.cc:
  Merging of pull conflicts
sql/sql_class.h:
  Merging of pull conflicts
This commit is contained in:
unknown
2002-06-17 17:14:20 +05:00
parent e19b23821a ea10430d9c
commit 0bf296a02b
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()
{