mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some mistakes fixed

Browse source
This commit is contained in:
hf@deer.(none) 2003-07-14 16:38:51 +05:00
parent f80738f296
commit 1b1a126aa1
5 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libmysql/libmysql.c
View file

@ -60,6 +60,12 @@
#include <sql_common.h>
#include "client_settings.h"
ulong net_buffer_length=8192;
ulong max_allowed_packet= 1024L*1024L*1024L;
ulong net_read_timeout= NET_READ_TIMEOUT;
ulong net_write_timeout= NET_WRITE_TIMEOUT;
#ifdef EMBEDDED_LIBRARY
#undef net_flush
my_bool net_flush(NET *net);
@ -150,6 +156,7 @@ void STDCALL mysql_server_end()
else
mysql_thread_end();
}
#endif /*EMBEDDED_LIBRARY*/
my_bool STDCALL mysql_thread_init()
@ -1225,6 +1232,19 @@ uint STDCALL mysql_thread_safe(void)
Some support functions
****************************************************************************/
/*
Functions called my my_net_init() to set some application specific variables
*/
void my_net_local_init(NET *net)
{
net->max_packet= (uint) net_buffer_length;
net->read_timeout= (uint) net_read_timeout;
net->write_timeout=(uint) net_write_timeout;
net->retry_count= 1;
net->max_packet_size= max(net_buffer_length, max_allowed_packet);
}
/*
Add escape characters to a string (blob?) to make it suitable for a insert
to should at least have place for length*2+1 chars

1
libmysqld/Makefile.am
View file

@ -115,6 +115,7 @@ link_sources:
rm -f $(srcdir)/$$f; \
@LN_CP_F@ $(srcdir)/../libmysql/$$f $(srcdir)/$$f; \
done; \
rm -f $(srcdir)/client_settings.h; \
@LN_CP_F@ $(srcdir)/../libmysql/client_settings.h $(srcdir)/client_settings.h;

1
libmysqld/libmysqld.c
View file

@ -46,7 +46,6 @@
#define INADDR_NONE -1
#endif
const char *not_error_sqlstate= "00000";
#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | CLIENT_PROTOCOL_41)
#if defined(MSDOS) || defined(__WIN__)

18
sql-common/pack.c
View file

@ -18,11 +18,6 @@
#include <mysql_com.h>
#include <mysql.h>
ulong net_buffer_length=8192;
ulong max_allowed_packet= 1024L*1024L*1024L;
ulong net_read_timeout= NET_READ_TIMEOUT;
ulong net_write_timeout= NET_WRITE_TIMEOUT;
/* Get the length of next field. Change parameter to point at fieldstart */
ulong STDCALL net_field_length(uchar **packet)
{
@ -83,19 +78,6 @@ my_ulonglong net_field_length_ll(uchar **packet)
#endif
}
/*
Functions called my my_net_init() to set some application specific variables
*/
void my_net_local_init(NET *net)
{
net->max_packet= (uint) net_buffer_length;
net->read_timeout= (uint) net_read_timeout;
net->write_timeout=(uint) net_write_timeout;
net->retry_count= 1;
net->max_packet_size= max(net_buffer_length, max_allowed_packet);
}
char *
net_store_length(char *pkg, ulonglong length)
{

2
sql/sql_client.cc
View file

@ -20,7 +20,6 @@
#include "mysql_priv.h"
#ifdef CLEAN_DUP
/*
Function called by my_net_init() to set some check variables
*/
@ -38,7 +37,6 @@ void my_net_local_init(NET *net)
#endif
}
}
#endif /*CLEAN_DUP*/
extern "C" {
void mysql_once_init(void)