diff options
| author | df@pippilotta.erinye.com <> | 2007-08-03 17:15:23 +0200 |
|---|---|---|
| committer | df@pippilotta.erinye.com <> | 2007-08-03 17:15:23 +0200 |
| commit | 493634e4c7010ae6e7974c5104ebde8c8adf949d (patch) | |
| tree | 41392b6e41e1b68bd6aeb6fb0853704e5a98ce3a /libmysql | |
| parent | 3d986fde8d352e83a6dac2292e52d1d71ee5e2b5 (diff) | |
| parent | 113cd2d064e500cd3241046ab374c490d95dace8 (diff) | |
| download | mariadb-git-493634e4c7010ae6e7974c5104ebde8c8adf949d.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-marvel
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index c24c6ab52db..3a2559921f9 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -68,7 +68,7 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ mf_iocache2.lo my_seek.lo my_sleep.lo \ my_pread.lo mf_cache.lo md5.lo sha1.lo \ my_getopt.lo my_gethostbyname.lo my_port.lo \ - my_rename.lo my_chsize.lo + my_rename.lo my_chsize.lo my_getsystime.lo sqlobjects = net.lo sql_cmn_objects = pack.lo client.lo my_time.lo diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 46d0c8f1037..b2f59ba2a5a 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -215,7 +215,7 @@ void STDCALL mysql_server_end() } static MYSQL_PARAMETERS mysql_internal_parameters= -{&max_allowed_packet, &net_buffer_length}; +{&max_allowed_packet, &net_buffer_length, 0}; MYSQL_PARAMETERS *STDCALL mysql_get_parameters(void) { |