diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-02-08 12:13:33 +0100 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2008-02-08 12:13:33 +0100 |
| commit | 4f98f3e683afe4f524219b0640ce18896e278ab8 (patch) | |
| tree | 84b77e8521fa1d155d7a44ba441199c0c89d547a /sql/mysql_priv.h | |
| parent | ccd53222d61d25ae2702d87a3b617a1f835eedc7 (diff) | |
| parent | 707e899c9e7b1b135a394809937588f5c57047a3 (diff) | |
| download | mariadb-git-4f98f3e683afe4f524219b0640ce18896e278ab8.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index f1a594351bc..91148e624b5 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1837,7 +1837,7 @@ extern ulong max_connections,max_connect_errors, connect_timeout; extern ulong slave_net_timeout, slave_trans_retries; extern uint max_user_connections; extern ulong what_to_log,flush_time; -extern ulong query_buff_size, thread_stack; +extern ulong query_buff_size; extern ulong max_prepared_stmt_count, prepared_stmt_count; extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit; extern ulong max_binlog_size, max_relay_log_size; |