diff options
| author | unknown <hf@deer.(none)> | 2004-08-20 16:25:47 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-08-20 16:25:47 +0500 |
| commit | 0432bec3117059696f2cb322ba597accc329fa03 (patch) | |
| tree | 317f35d89952f2b3ddf18c3eee8bef49b9923719 /sql | |
| parent | 6d0f675a45cbf2068b059ec0731433912d880e59 (diff) | |
| parent | 2e09e96b05777bf186c2fbdfaff703c71af0f28a (diff) | |
| download | mariadb-git-0432bec3117059696f2cb322ba597accc329fa03.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 | ||||
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
3 files changed, 6 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> diff --git a/sql/set_var.cc b/sql/set_var.cc index 5db4b1476a6..ffe24d5feca 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1138,8 +1138,10 @@ static int check_max_delayed_threads(THD *thd, set_var *var) static void fix_max_connections(THD *thd, enum_var_type type) { +#ifndef EMBEDDED_LIBRARY resize_thr_alarm(max_connections + global_system_variables.max_insert_delayed_threads + 10); +#endif } diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index db904d24bf7..46410ca8772 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -696,6 +696,7 @@ static bool emb_insert_params(Prepared_statement *stmt, String *expanded_query) else { uchar *buff= (uchar*) client_param->buffer; + param->unsigned_flag= client_param->is_unsigned; param->set_param_func(param, &buff, client_param->length ? *client_param->length : @@ -736,6 +737,7 @@ static bool emb_insert_params_withlog(Prepared_statement *stmt, String *query) else { uchar *buff= (uchar*)client_param->buffer; + param->unsigned_flag= client_param->is_unsigned; param->set_param_func(param, &buff, client_param->length ? *client_param->length : |