diff options
| author | unknown <paul@snake-hub.snake.net> | 2006-02-13 11:22:49 -0600 |
|---|---|---|
| committer | unknown <paul@snake-hub.snake.net> | 2006-02-13 11:22:49 -0600 |
| commit | 10c6505550d1b0c00f60b701447262021fc66138 (patch) | |
| tree | 32d4e498cf651954ebec7623c4a78fec3d666477 | |
| parent | d263d8b0d6beabb4a2c0b195383d223ed2e89115 (diff) | |
| parent | 01e880ede6f9873093fb15982b8be4eb69fde691 (diff) | |
| download | mariadb-git-10c6505550d1b0c00f60b701447262021fc66138.tar.gz | |
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index d945e0842e4..5b99085ba6c 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -835,6 +835,7 @@ struct show_var_st init_vars[]= { {sys_innodb_fast_shutdown.name,(char*) &sys_innodb_fast_shutdown, SHOW_SYS}, {"innodb_file_io_threads", (char*) &innobase_file_io_threads, SHOW_LONG }, {"innodb_file_per_table", (char*) &innobase_file_per_table, SHOW_MY_BOOL}, + {sys_innodb_flush_log_at_trx_commit.name, (char*) &sys_innodb_flush_log_at_trx_commit, SHOW_SYS}, {"innodb_flush_method", (char*) &innobase_unix_file_flush_method, SHOW_CHAR_PTR}, {"innodb_force_recovery", (char*) &innobase_force_recovery, SHOW_LONG }, {"innodb_lock_wait_timeout", (char*) &innobase_lock_wait_timeout, SHOW_LONG }, @@ -854,7 +855,6 @@ struct show_var_st init_vars[]= { {sys_innodb_table_locks.name, (char*) &sys_innodb_table_locks, SHOW_SYS}, {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_flush_log_at_trx_commit.name, (char*) &sys_innodb_flush_log_at_trx_commit, SHOW_SYS}, #endif {sys_interactive_timeout.name,(char*) &sys_interactive_timeout, SHOW_SYS}, {sys_join_buffer_size.name, (char*) &sys_join_buffer_size, SHOW_SYS}, |