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

Merging

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2002-12-16 18:58:55 +04:00
parent fce29f66fb 632717fd8d
commit 8db300257b
47 changed files with 1385 additions and 1478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_class.cc
View File

@@ -109,8 +109,10 @@ THD::THD():user_time(0), fatal_error(0),
mysys_var=0;
#ifndef DBUG_OFF
dbug_sentry=THD_SENTRY_MAGIC;
#endif
#endif
#ifndef EMBEDDED_LIBRARY
net.vio=0;
#endif
net.last_error[0]=0; // If error on boot
ull=0;
system_thread=cleanup_done=0;
@@ -268,11 +270,13 @@ THD::~THD()
pthread_mutex_unlock(&LOCK_delete);
/* Close connection */
#ifndef EMBEDDED_LIBRARY
if (net.vio)
{
vio_delete(net.vio);
net_end(&net);
}
#endif
if (!cleanup_done)
cleanup();
#ifdef USING_TRANSACTIONS
@@ -513,6 +517,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)
@@ -545,6 +551,7 @@ bool select_send::send_data(List<Item> &items)
DBUG_RETURN(protocol->write());
DBUG_RETURN(1);
}
#endif /* EMBEDDED_LIBRARY */
bool select_send::send_eof()
{