diff options
author | unknown <vtkachenko@intelp4d.mysql.com> | 2005-01-08 15:06:20 +0100 |
---|---|---|
committer | unknown <vtkachenko@intelp4d.mysql.com> | 2005-01-08 15:06:20 +0100 |
commit | 6f45da15f3463b200b521288ec12d3af4822922b (patch) | |
tree | 2944cc54d45f7782916b02e7a20c075450ae2566 /innobase/include | |
parent | 5802259dc5ca818c53332b360dba09570f4f6e81 (diff) | |
parent | 8a8823d27f751eaf686b797329839444f654ad65 (diff) | |
download | mariadb-git-6f45da15f3463b200b521288ec12d3af4822922b.tar.gz |
Merge bk-internal:/home/bk/mysql-5.0
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
innobase/srv/srv0srv.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'innobase/include')
-rw-r--r-- | innobase/include/srv0srv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/innobase/include/srv0srv.h b/innobase/include/srv0srv.h index 5f752717fcc..c5374fd00fa 100644 --- a/innobase/include/srv0srv.h +++ b/innobase/include/srv0srv.h @@ -134,6 +134,8 @@ extern ibool srv_lock_timeout_and_monitor_active; extern ibool srv_error_monitor_active; extern ulint srv_n_spin_wait_rounds; +extern ulint srv_n_free_tickets_to_enter; +extern ulint srv_thread_sleep_delay; extern ulint srv_spin_wait_delay; extern ibool srv_priority_boost; |