diff options
| author | unknown <hf@deer.(none)> | 2004-08-19 15:47:09 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-08-19 15:47:09 +0500 |
| commit | 37c025e6f9e862725a819076a4967dfc4913974d (patch) | |
| tree | 1bb5b160e9bb81115b19732348ba96c4bf069602 /sql/mysqld.cc | |
| parent | cba27e4a91d18439f421b3a33d27df8a2bfa04c1 (diff) | |
| parent | de40ed916e4d4a70cee06250682e8a2c52d527a8 (diff) | |
| download | mariadb-git-37c025e6f9e862725a819076a4967dfc4913974d.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2c85fb004d8..7050929d6ed 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5619,9 +5619,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), #ifdef EMBEDDED_LIBRARY case OPT_MAX_ALLOWED_PACKET: max_allowed_packet= atoi(argument); + global_system_variables.max_allowed_packet= max_allowed_packet; break; case OPT_NET_BUFFER_LENGTH: net_buffer_length= atoi(argument); + global_system_variables.net_buffer_length= net_buffer_length; break; #endif #include <sslopt-case.h> |