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

Revert "MDEV-9293 Connector/C integration"

Browse Source 
This reverts commit 7b89b9f510.
This commit is contained in:
Vladislav Vaintroub
2016-08-19 15:46:27 +00:00
parent 7b89b9f510
commit 31a8cf54c8
61 changed files with 412 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sql/sql_class.h
View File

@ -45,7 +45,6 @@
#include <mysql/psi/mysql_idle.h>
#include <mysql/psi/mysql_table.h>
#include <mysql_com_server.h>
#include <mysql.h>
extern "C"
void set_thd_stage_info(void *thd,
@ -2014,7 +2013,7 @@ public:
static const char * const DEFAULT_WHERE;
#ifdef EMBEDDED_LIBRARY
MYSQL *emb_mysql;
struct st_mysql *mysql;
unsigned long client_stmt_id;
unsigned long client_param_count;
struct st_mysql_bind *client_params;
@ -2426,11 +2425,9 @@ public:
#ifndef __WIN__
sigset_t signals;
#endif
#ifndef EMBEDDED_LIBRARY
MYSQL *active_mysql;
#ifdef SIGNAL_WITH_VIO_CLOSE
Vio* active_vio;
#endif
/*
This is to track items changed during execution of a prepared
statement/stored procedure. It's created by
@ -3028,25 +3025,21 @@ public:
void reset_for_reuse();
bool store_globals();
void reset_globals();
inline void set_active_mysql(MYSQL *active_mysql)
#ifdef SIGNAL_WITH_VIO_CLOSE
inline void set_active_vio(Vio* vio)
{
#ifndef EMBEDDED_LIBRARY
mysql_mutex_lock(&LOCK_thd_data);
this->active_mysql= active_mysql;
active_vio = vio;
mysql_mutex_unlock(&LOCK_thd_data);
#endif
}
inline void clear_active_mysql()
inline void clear_active_vio()
{
#ifndef EMBEDDED_LIBRARY
mysql_mutex_lock(&LOCK_thd_data);
active_mysql= 0;
active_vio = 0;
mysql_mutex_unlock(&LOCK_thd_data);
#endif
}
void close_active_mysql();
void close_active_vio();
#endif
void awake(killed_state state_to_set);
/** Disconnect the associated communication endpoint. */