Commit 10aeefce authored by Hakan Kuecuekyilmaz's avatar Hakan Kuecuekyilmaz

Merge.

parents 70fbd556 6cabc7ab
...@@ -8084,7 +8084,7 @@ mysqld_get_one_option(int optid, ...@@ -8084,7 +8084,7 @@ mysqld_get_one_option(int optid,
switch(optid) { switch(optid) {
#ifndef DBUG_OFF #ifndef DBUG_OFF
case OPT_DEBUG_FLUSH: case OPT_DEBUG_FLUSH:
argument= IF_WIN(default_dbug_option, (char*) "d:t:i:O,/tmp/mysqld.trace"); argument= IF_WIN((char*) default_dbug_option, (char*) "d:t:i:O,/tmp/mysqld.trace");
/* fall through */ /* fall through */
case '#': case '#':
if (!argument) if (!argument)
......
...@@ -116,8 +116,8 @@ extern ulint srv_log_file_size; ...@@ -116,8 +116,8 @@ extern ulint srv_log_file_size;
extern ulint srv_log_buffer_size; extern ulint srv_log_buffer_size;
extern ulong srv_flush_log_at_trx_commit; extern ulong srv_flush_log_at_trx_commit;
extern ulint srv_show_locks_held; extern ulong srv_show_locks_held;
extern ulint srv_show_verbose_locks; extern ulong srv_show_verbose_locks;
/* The sort order table of the MySQL latin1_swedish_ci character set /* The sort order table of the MySQL latin1_swedish_ci character set
collation */ collation */
...@@ -166,11 +166,11 @@ extern ulint srv_fast_shutdown; /* If this is 1, do not do a ...@@ -166,11 +166,11 @@ extern ulint srv_fast_shutdown; /* If this is 1, do not do a
extern ibool srv_innodb_status; extern ibool srv_innodb_status;
extern unsigned long long srv_stats_sample_pages; extern unsigned long long srv_stats_sample_pages;
extern ulint srv_stats_method; extern ulong srv_stats_method;
#define SRV_STATS_METHOD_NULLS_EQUAL 0 #define SRV_STATS_METHOD_NULLS_EQUAL 0
#define SRV_STATS_METHOD_NULLS_NOT_EQUAL 1 #define SRV_STATS_METHOD_NULLS_NOT_EQUAL 1
#define SRV_STATS_METHOD_IGNORE_NULLS 2 #define SRV_STATS_METHOD_IGNORE_NULLS 2
extern ulint srv_stats_auto_update; extern ulong srv_stats_auto_update;
extern ibool srv_use_doublewrite_buf; extern ibool srv_use_doublewrite_buf;
extern ibool srv_use_checksums; extern ibool srv_use_checksums;
...@@ -183,19 +183,19 @@ extern ulong srv_max_purge_lag; ...@@ -183,19 +183,19 @@ extern ulong srv_max_purge_lag;
extern ulong srv_replication_delay; extern ulong srv_replication_delay;
extern ulint srv_io_capacity; extern ulong srv_io_capacity;
extern long long srv_ibuf_max_size; extern long long srv_ibuf_max_size;
extern ulint srv_ibuf_active_contract; extern ulong srv_ibuf_active_contract;
extern ulint srv_ibuf_accel_rate; extern ulong srv_ibuf_accel_rate;
extern ulint srv_flush_neighbor_pages; extern ulong srv_flush_neighbor_pages;
extern ulint srv_enable_unsafe_group_commit; extern ulong srv_enable_unsafe_group_commit;
extern ulint srv_read_ahead; extern ulong srv_read_ahead;
extern ulint srv_adaptive_checkpoint; extern ulong srv_adaptive_checkpoint;
extern ulint srv_expand_import; extern ulong srv_expand_import;
extern ulint srv_extra_rsegments; extern ulong srv_extra_rsegments;
extern ulint srv_dict_size_limit; extern ulong srv_dict_size_limit;
/*-------------------------------------------*/ /*-------------------------------------------*/
extern ulint srv_n_rows_inserted; extern ulint srv_n_rows_inserted;
......
...@@ -160,8 +160,8 @@ UNIV_INTERN ulint srv_log_file_size = ULINT_MAX; ...@@ -160,8 +160,8 @@ UNIV_INTERN ulint srv_log_file_size = ULINT_MAX;
UNIV_INTERN ulint srv_log_buffer_size = ULINT_MAX; UNIV_INTERN ulint srv_log_buffer_size = ULINT_MAX;
UNIV_INTERN ulong srv_flush_log_at_trx_commit = 1; UNIV_INTERN ulong srv_flush_log_at_trx_commit = 1;
UNIV_INTERN ulint srv_show_locks_held = 10; UNIV_INTERN ulong srv_show_locks_held = 10;
UNIV_INTERN ulint srv_show_verbose_locks = 0; UNIV_INTERN ulong srv_show_verbose_locks = 0;
/* The sort order table of the MySQL latin1_swedish_ci character set /* The sort order table of the MySQL latin1_swedish_ci character set
...@@ -338,8 +338,8 @@ UNIV_INTERN ibool srv_innodb_status = FALSE; ...@@ -338,8 +338,8 @@ UNIV_INTERN ibool srv_innodb_status = FALSE;
/* When estimating number of different key values in an index, sample /* When estimating number of different key values in an index, sample
this many index pages */ this many index pages */
UNIV_INTERN unsigned long long srv_stats_sample_pages = 8; UNIV_INTERN unsigned long long srv_stats_sample_pages = 8;
UNIV_INTERN ulint srv_stats_method = 0; UNIV_INTERN ulong srv_stats_method = 0;
UNIV_INTERN ulint srv_stats_auto_update = 1; UNIV_INTERN ulong srv_stats_auto_update = 1;
UNIV_INTERN ibool srv_use_doublewrite_buf = TRUE; UNIV_INTERN ibool srv_use_doublewrite_buf = TRUE;
UNIV_INTERN ibool srv_use_checksums = TRUE; UNIV_INTERN ibool srv_use_checksums = TRUE;
...@@ -349,7 +349,7 @@ UNIV_INTERN int srv_query_thread_priority = 0; ...@@ -349,7 +349,7 @@ UNIV_INTERN int srv_query_thread_priority = 0;
UNIV_INTERN ulong srv_replication_delay = 0; UNIV_INTERN ulong srv_replication_delay = 0;
UNIV_INTERN ulint srv_io_capacity = 100; UNIV_INTERN ulong srv_io_capacity = 100;
/* Returns the number of IO operations that is X percent of the capacity. /* Returns the number of IO operations that is X percent of the capacity.
PCT_IO(5) -> returns the number of IO operations that is 5% of the max PCT_IO(5) -> returns the number of IO operations that is 5% of the max
...@@ -357,20 +357,20 @@ where max is srv_io_capacity. */ ...@@ -357,20 +357,20 @@ where max is srv_io_capacity. */
#define PCT_IO(pct) ((ulint) (srv_io_capacity * ((double) pct / 100.0))) #define PCT_IO(pct) ((ulint) (srv_io_capacity * ((double) pct / 100.0)))
UNIV_INTERN long long srv_ibuf_max_size = 0; UNIV_INTERN long long srv_ibuf_max_size = 0;
UNIV_INTERN ulint srv_ibuf_active_contract = 0; /* 0:disable 1:enable */ UNIV_INTERN ulong srv_ibuf_active_contract = 0; /* 0:disable 1:enable */
UNIV_INTERN ulint srv_ibuf_accel_rate = 100; UNIV_INTERN ulong srv_ibuf_accel_rate = 100;
#define PCT_IBUF_IO(pct) ((ulint) (srv_io_capacity * srv_ibuf_accel_rate * ((double) pct / 10000.0))) #define PCT_IBUF_IO(pct) ((ulint) (srv_io_capacity * srv_ibuf_accel_rate * ((double) pct / 10000.0)))
UNIV_INTERN ulint srv_flush_neighbor_pages = 1; /* 0:disable 1:enable */ UNIV_INTERN ulong srv_flush_neighbor_pages = 1; /* 0:disable 1:enable */
UNIV_INTERN ulint srv_enable_unsafe_group_commit = 0; /* 0:disable 1:enable */ UNIV_INTERN ulong srv_enable_unsafe_group_commit = 0; /* 0:disable 1:enable */
UNIV_INTERN ulint srv_read_ahead = 3; /* 1: random 2: linear 3: Both */ UNIV_INTERN ulong srv_read_ahead = 3; /* 1: random 2: linear 3: Both */
UNIV_INTERN ulint srv_adaptive_checkpoint = 0; /* 0: none 1: reflex 2: estimate */ UNIV_INTERN ulong srv_adaptive_checkpoint = 0; /* 0: none 1: reflex 2: estimate */
UNIV_INTERN ulint srv_expand_import = 0; /* 0:disable 1:enable */ UNIV_INTERN ulong srv_expand_import = 0; /* 0:disable 1:enable */
UNIV_INTERN ulint srv_extra_rsegments = 0; /* extra rseg for users */ UNIV_INTERN ulong srv_extra_rsegments = 0; /* extra rseg for users */
UNIV_INTERN ulint srv_dict_size_limit = 0; UNIV_INTERN ulong srv_dict_size_limit = 0;
/*-------------------------------------------*/ /*-------------------------------------------*/
UNIV_INTERN ulong srv_n_spin_wait_rounds = 20; UNIV_INTERN ulong srv_n_spin_wait_rounds = 20;
UNIV_INTERN ulong srv_n_free_tickets_to_enter = 500; UNIV_INTERN ulong srv_n_free_tickets_to_enter = 500;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment