diff options
| author | unknown <paul@ice.snake.net> | 2004-08-20 13:10:05 -0500 |
|---|---|---|
| committer | unknown <paul@ice.snake.net> | 2004-08-20 13:10:05 -0500 |
| commit | 7d3b20e3e42c6edf52dd09f8d25cb569933694ce (patch) | |
| tree | 2c1f16b80bf2a08981f3704a69d3e8d803bb2a51 /sql/mysqld.cc | |
| parent | 17c0da832810b4c6bccef2852085ac0debda70a8 (diff) | |
| parent | 8f68a9eb6f62183742d8f37bc5ec94a48e831a5d (diff) | |
| download | mariadb-git-7d3b20e3e42c6edf52dd09f8d25cb569933694ce.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
sql/mysqld.cc:
Auto merged
sql/set_var.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 3412ebbe230..9c1e11093a5 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> |