mirror of
https://github.com/MariaDB/server.git
synced 2025-02-16 18:35:34 +01:00
SCRUM
Including client code into embedded library Code trimming (fixes of comments etc)
This commit is contained in:
parent
fed7a8d672
commit
c224b55835
7 changed files with 4 additions and 20 deletions
include
libmysql
libmysqld
sql-common
sql
|
@ -234,9 +234,7 @@ void net_end(NET *net);
|
||||||
void net_clear(NET *net);
|
void net_clear(NET *net);
|
||||||
my_bool net_realloc(NET *net, unsigned long length);
|
my_bool net_realloc(NET *net, unsigned long length);
|
||||||
|
|
||||||
/*HFTODO - should remove it
|
#ifndef EMBEDDED_LIBRARY /* To be removed by HF */
|
||||||
*/
|
|
||||||
#ifndef EMBEDDED_LIBRARY
|
|
||||||
my_bool net_flush(NET *net);
|
my_bool net_flush(NET *net);
|
||||||
#else
|
#else
|
||||||
#define net_flush(A)
|
#define net_flush(A)
|
||||||
|
|
|
@ -19,9 +19,7 @@
|
||||||
#ifdef EMBEDDED_LIBRARY
|
#ifdef EMBEDDED_LIBRARY
|
||||||
|
|
||||||
/* Things we don't need in the embedded version of MySQL */
|
/* Things we don't need in the embedded version of MySQL */
|
||||||
/*HFTODO
|
/* TODO HF add #undef HAVE_VIO if we don't want client in embedded library */
|
||||||
#undef HAVE_VIO - if we don't want client in embedded library
|
|
||||||
*/
|
|
||||||
|
|
||||||
#undef HAVE_PSTACK /* No stacktrace */
|
#undef HAVE_PSTACK /* No stacktrace */
|
||||||
#undef HAVE_DLOPEN /* No udf functions */
|
#undef HAVE_DLOPEN /* No udf functions */
|
||||||
|
|
|
@ -220,8 +220,7 @@ enum SSL_type
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/* HFTODO - hide this if we don't want client in embedded server
|
/* HFTODO - hide this if we don't want client in embedded server */
|
||||||
*/
|
|
||||||
/* This structure is for every connection on both sides */
|
/* This structure is for every connection on both sides */
|
||||||
struct st_vio
|
struct st_vio
|
||||||
{
|
{
|
||||||
|
|
|
@ -61,12 +61,8 @@
|
||||||
#include "client_settings.h"
|
#include "client_settings.h"
|
||||||
|
|
||||||
#ifdef EMBEDDED_LIBRARY
|
#ifdef EMBEDDED_LIBRARY
|
||||||
#ifdef net_flush
|
|
||||||
#undef net_flush
|
#undef net_flush
|
||||||
#endif
|
|
||||||
|
|
||||||
my_bool net_flush(NET *net);
|
my_bool net_flush(NET *net);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MSDOS) || defined(__WIN__)
|
#if defined(MSDOS) || defined(__WIN__)
|
||||||
|
|
|
@ -64,8 +64,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
|
||||||
const char *header, ulong header_length,
|
const char *header, ulong header_length,
|
||||||
const char *arg, ulong arg_length, my_bool skip_check);
|
const char *arg, ulong arg_length, my_bool skip_check);
|
||||||
|
|
||||||
/*FROM client.c
|
/* From client.c */
|
||||||
*/
|
|
||||||
void mysql_read_default_options(struct st_mysql_options *options,
|
void mysql_read_default_options(struct st_mysql_options *options,
|
||||||
const char *filename,const char *group);
|
const char *filename,const char *group);
|
||||||
MYSQL * STDCALL
|
MYSQL * STDCALL
|
||||||
|
|
|
@ -41,9 +41,7 @@
|
||||||
|
|
||||||
#ifdef EMBEDDED_LIBRARY
|
#ifdef EMBEDDED_LIBRARY
|
||||||
|
|
||||||
#ifdef MYSQL_SERVER
|
|
||||||
#undef MYSQL_SERVER
|
#undef MYSQL_SERVER
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef MYSQL_CLIENT
|
#ifndef MYSQL_CLIENT
|
||||||
#define MYSQL_CLIENT
|
#define MYSQL_CLIENT
|
||||||
|
@ -51,9 +49,7 @@
|
||||||
|
|
||||||
#define CLI_MYSQL_REAL_CONNECT cli_mysql_real_connect
|
#define CLI_MYSQL_REAL_CONNECT cli_mysql_real_connect
|
||||||
|
|
||||||
#ifdef net_flush
|
|
||||||
#undef net_flush
|
#undef net_flush
|
||||||
#endif
|
|
||||||
my_bool net_flush(NET *net);
|
my_bool net_flush(NET *net);
|
||||||
|
|
||||||
#else /*EMBEDDED_LIBRARY*/
|
#else /*EMBEDDED_LIBRARY*/
|
||||||
|
|
|
@ -51,9 +51,7 @@
|
||||||
|
|
||||||
#ifdef EMBEDDED_LIBRARY
|
#ifdef EMBEDDED_LIBRARY
|
||||||
|
|
||||||
#ifdef net_flush
|
|
||||||
#undef net_flush
|
#undef net_flush
|
||||||
#endif
|
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
my_bool net_flush(NET *net);
|
my_bool net_flush(NET *net);
|
||||||
|
|
Loading…
Add table
Reference in a new issue