diff options
| author | vtkachenko@mail.mysql.com <> | 2005-01-12 21:03:06 +0100 |
|---|---|---|
| committer | vtkachenko@mail.mysql.com <> | 2005-01-12 21:03:06 +0100 |
| commit | 306df487312ef969878f6f27e4b1ab9db99a6129 (patch) | |
| tree | 4c556c0360794ec5c1e71dde398325d1f1c86128 /sql/ha_innodb.cc | |
| parent | f01f721672fbdfc053316964e053ba077c54b6e7 (diff) | |
| parent | 9f640bbad9d4bab1124019e17d1596e647f6ac76 (diff) | |
| download | mariadb-git-306df487312ef969878f6f27e4b1ab9db99a6129.tar.gz | |
Merge
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 3df61333b75..02da7f876e2 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -250,7 +250,7 @@ struct show_var_st innodb_status_variables[]= { {"rows_updated", (char*) &export_vars.innodb_rows_updated, SHOW_LONG}, {NullS, NullS, SHOW_LONG}}; - + /* General functions */ /********************************************************************** @@ -1150,7 +1150,6 @@ innobase_init(void) srv_n_file_io_threads = (ulint) innobase_file_io_threads; srv_lock_wait_timeout = (ulint) innobase_lock_wait_timeout; - srv_thread_concurrency = (ulint) innobase_thread_concurrency; srv_force_recovery = (ulint) innobase_force_recovery; srv_fast_shutdown = (ibool) innobase_fast_shutdown; |