diff options
| author | unknown <vtkachenko@mail.mysql.com> | 2005-01-12 21:03:06 +0100 |
|---|---|---|
| committer | unknown <vtkachenko@mail.mysql.com> | 2005-01-12 21:03:06 +0100 |
| commit | c846af9ba2ec7f4aff91ea97e85893c3312d2c93 (patch) | |
| tree | 4c556c0360794ec5c1e71dde398325d1f1c86128 /sql/set_var.cc | |
| parent | fd7e0d847b6fd2d0f9729b3c6a37f19e62d67128 (diff) | |
| parent | 8f61caea0a8964dc434ed1cc8fb91e48463c540f (diff) | |
| download | mariadb-git-c846af9ba2ec7f4aff91ea97e85893c3312d2c93.tar.gz | |
Merge
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
resolve conflicts
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 13e3d375448..a0ec68098cb 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -378,6 +378,14 @@ sys_var_thd_bool sys_innodb_table_locks("innodb_table_locks", &SV::innodb_table_locks); sys_var_long_ptr sys_innodb_autoextend_increment("innodb_autoextend_increment", &srv_auto_extend_increment); +sys_var_long_ptr sys_innodb_sync_spin_loops("innodb_sync_spin_loops", + &srv_n_spin_wait_rounds); +sys_var_long_ptr sys_innodb_concurrency_tickets("innodb_concurrency_tickets", + &srv_n_free_tickets_to_enter); +sys_var_long_ptr sys_innodb_thread_sleep_delay("innodb_thread_sleep_delay", + &srv_thread_sleep_delay); +sys_var_long_ptr sys_innodb_thread_concurrency("innodb_thread_concurrency", + &srv_thread_concurrency); #endif #ifdef HAVE_NDBCLUSTER_DB @@ -651,6 +659,10 @@ sys_var *sys_variables[]= &sys_innodb_table_locks, &sys_innodb_max_purge_lag, &sys_innodb_autoextend_increment, + &sys_innodb_sync_spin_loops, + &sys_innodb_concurrency_tickets, + &sys_innodb_thread_sleep_delay, + &sys_innodb_thread_concurrency, #endif #ifdef HAVE_NDBCLUSTER_DB &sys_ndb_autoincrement_prefetch_sz, @@ -742,6 +754,7 @@ struct show_var_st init_vars[]= { {"innodb_data_home_dir", (char*) &innobase_data_home_dir, SHOW_CHAR_PTR}, {"innodb_doublewrite", (char*) &innobase_use_doublewrite, SHOW_MY_BOOL}, {"innodb_checksums", (char*) &innobase_use_checksums, SHOW_MY_BOOL}, + {sys_innodb_concurrency_tickets.name, (char*) &sys_innodb_concurrency_tickets, SHOW_SYS}, {"innodb_fast_shutdown", (char*) &innobase_fast_shutdown, SHOW_MY_BOOL}, {"innodb_file_io_threads", (char*) &innobase_file_io_threads, SHOW_LONG }, {"innodb_file_per_table", (char*) &innobase_file_per_table, SHOW_MY_BOOL}, @@ -760,8 +773,10 @@ struct show_var_st init_vars[]= { {sys_innodb_max_purge_lag.name, (char*) &sys_innodb_max_purge_lag, SHOW_SYS}, {"innodb_mirrored_log_groups", (char*) &innobase_mirrored_log_groups, SHOW_LONG}, {"innodb_open_files", (char*) &innobase_open_files, SHOW_LONG }, + {sys_innodb_thread_concurrency.name, (char*) &sys_innodb_thread_concurrency, SHOW_SYS}, + {sys_innodb_thread_sleep_delay.name, (char*) &sys_innodb_thread_sleep_delay, SHOW_SYS}, + {sys_innodb_sync_spin_loops.name, (char*) &sys_innodb_sync_spin_loops, SHOW_SYS}, {sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS}, - {"innodb_thread_concurrency", (char*) &innobase_thread_concurrency, SHOW_LONG }, #endif {sys_interactive_timeout.name,(char*) &sys_interactive_timeout, SHOW_SYS}, {sys_join_buffer_size.name, (char*) &sys_join_buffer_size, SHOW_SYS}, |