diff options
| author | unknown <serg@janus.mylan> | 2006-10-13 11:43:33 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2006-10-13 11:43:33 +0200 |
| commit | 67a2b7cf298d0a351256ab13c2577c32e20bd723 (patch) | |
| tree | ba0eb1eef3749ba0752df03beef0f6f83cde973c /sql/mysql_priv.h | |
| parent | 0a1dc8af5b665647a08c51f75b5d5c2e1a112d99 (diff) | |
| parent | c2872bafde6d6ec2444c293f7a8aa397eb1dbb59 (diff) | |
| download | mariadb-git-67a2b7cf298d0a351256ab13c2577c32e20bd723.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into janus.mylan:/usr/home/serg/Abk/mysql-maria
configure.in:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
mysys/Makefile.am:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_test.cc:
Auto merged
storage/maria/Makefile.am:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
unittest/Makefile.am:
Auto merged
unittest/mysys/my_atomic-t.c:
merged
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 4545ce99159..b3106c59a40 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1544,7 +1544,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; |