diff options
| author | unknown <monty@mysql.com> | 2004-05-27 00:30:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-27 00:30:28 +0300 |
| commit | 7c5cd4125dfe7b6891aeffc567387573695714c3 (patch) | |
| tree | 5ed4e118d371f2a1d84eaaef85c5869d24977363 /libmysqld | |
| parent | 5fe72df8fd23a5b5f6938a9e559e916594b78449 (diff) | |
| parent | cc24ac7079827af1290a87ca0d5ce817329a9f6b (diff) | |
| download | mariadb-git-7c5cd4125dfe7b6891aeffc567387573695714c3.tar.gz | |
merge with 4.0 to get windows fixes
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/que/que0que.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 5 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 16 | ||||
| -rw-r--r-- | libmysqld/libmysqld.def | 3 |
3 files changed, 21 insertions, 3 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 2bbca220db9..26609e748a7 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -23,6 +23,11 @@ #define mysql_unix_port mysql_inix_port1 #define mysql_port mysql_port1 +extern "C" +{ + unsigned long max_allowed_packet, net_buffer_length; +} + static int fake_argc= 1; static char *fake_argv[]= {(char *)"", 0}; static const char *fake_groups[] = { "server", "embedded", 0 }; diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index db9e828369d..b4804c62f2d 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -47,6 +47,9 @@ #define INADDR_NONE -1 #endif +extern ulong net_buffer_length; +extern ulong max_allowed_packet; + #if defined(MSDOS) || defined(__WIN__) #define ERRNO WSAGetLastError() #define perror(A) @@ -81,7 +84,17 @@ static void end_server(MYSQL *mysql) DBUG_VOID_RETURN; } -static inline int mysql_init_charset(MYSQL *mysql) + +static MYSQL_PARAMETERS mysql_internal_parameters= +{&max_allowed_packet, &net_buffer_length}; + +MYSQL_PARAMETERS *STDCALL mysql_get_parameters() +{ + return &mysql_internal_parameters; +} + + +static int mysql_init_charset(MYSQL *mysql) { char charset_name_buff[16], *charset_name; @@ -124,6 +137,7 @@ static inline int mysql_init_charset(MYSQL *mysql) return 0; } + MYSQL * STDCALL mysql_real_connect(MYSQL *mysql,const char *host, const char *user, const char *passwd, const char *db, diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index 8b2ad8379d6..7c93951df7a 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -92,7 +92,6 @@ EXPORTS mysql_thread_safe mysql_use_result mysql_warning_count - net_buffer_length set_dynamic strcend strcont @@ -128,5 +127,5 @@ EXPORTS alloc_root free_root my_read - max_allowed_packet llstr + mysql_get_parameters |