mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

SCRUM

Browse source 
Including client code into embedded library

Code trimming (fixes of comments etc)
This commit is contained in:
hf@deer.(none) 2003-07-04 11:40:10 +05:00
parent fed7a8d672
commit c224b55835
7 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mysql_com.h
View file

@ -234,9 +234,7 @@ void net_end(NET *net);
void net_clear(NET *net);
my_bool net_realloc(NET *net, unsigned long length);
/*HFTODO - should remove it
*/
#ifndef EMBEDDED_LIBRARY
#ifndef EMBEDDED_LIBRARY /* To be removed by HF */
my_bool net_flush(NET *net);
#else
#define net_flush(A)

4
include/mysql_embed.h
View file

@ -19,9 +19,7 @@
#ifdef EMBEDDED_LIBRARY
/* Things we don't need in the embedded version of MySQL */
/*HFTODO
#undef HAVE_VIO - if we don't want client in embedded library
*/
/* TODO HF add #undef HAVE_VIO if we don't want client in embedded library */
#undef HAVE_PSTACK /* No stacktrace */
#undef HAVE_DLOPEN /* No udf functions */

3
include/violite.h
View file

@ -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 */
struct st_vio
{

4
libmysql/libmysql.c
View file

@ -61,12 +61,8 @@
#include "client_settings.h"
#ifdef EMBEDDED_LIBRARY
#ifdef net_flush
#undef net_flush
#endif
my_bool net_flush(NET *net);
#endif
#if defined(MSDOS) || defined(__WIN__)

3
libmysqld/libmysqld.c
View file

@ -64,8 +64,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
const char *header, ulong header_length,
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,
const char *filename,const char *group);
MYSQL * STDCALL

4
sql-common/client.c
View file

@ -41,9 +41,7 @@
#ifdef EMBEDDED_LIBRARY
#ifdef MYSQL_SERVER
#undef MYSQL_SERVER
#endif
#ifndef MYSQL_CLIENT
#define MYSQL_CLIENT
@ -51,9 +49,7 @@
#define CLI_MYSQL_REAL_CONNECT cli_mysql_real_connect
#ifdef net_flush
#undef net_flush
#endif
my_bool net_flush(NET *net);
#else /*EMBEDDED_LIBRARY*/

2
sql/net_serv.cc
View file

@ -51,9 +51,7 @@
#ifdef EMBEDDED_LIBRARY
#ifdef net_flush
#undef net_flush
#endif
extern "C" {
my_bool net_flush(NET *net);