diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-10-13 22:54:21 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-10-13 22:54:21 +0300 |
| commit | f0ed73d874d92bd6e21333bcba4b1097db069213 (patch) | |
| tree | dcfb685f5a1696d2b8d23c9fd6988c7646d6e469 /sql/set_var.cc | |
| parent | eb3b0480002d257d9beb5262fd51619cc4b50a1f (diff) | |
| download | mariadb-git-f0ed73d874d92bd6e21333bcba4b1097db069213.tar.gz | |
Added startup option and settable session variable
innodb_table_locks_old_behavior: do not acquire an
InnoDB table lock for LOCK TABLES, as in mysql-4.0.18
and earlier.
sql/ha_innodb.cc:
Do not acquire an InnoDB table lock for LOCK TABLES if
innodb_table_locks_old_behavior is enabled.
sql/mysqld.cc:
Added innodb_table_locks_old_behavior
sql/set_var.cc:
Added innodb_table_locks_old_behavior
sql/sql_class.h:
Added innodb_table_locks_old_behavior
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 4b66a621f62..9b2db7a0802 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -263,6 +263,8 @@ sys_var_thd_ulong sys_net_wait_timeout("wait_timeout", #ifdef HAVE_INNOBASE_DB sys_var_long_ptr sys_innodb_max_dirty_pages_pct("innodb_max_dirty_pages_pct", &srv_max_buf_pool_modified_pct); +sys_var_thd_bool sys_innodb_table_locks_old_behavior("innodb_table_locks_old_behavior", + &SV::innodb_table_locks_old_behavior); #endif @@ -449,6 +451,7 @@ sys_var *sys_variables[]= &sys_os, #ifdef HAVE_INNOBASE_DB &sys_innodb_max_dirty_pages_pct, + &sys_innodb_table_locks_old_behavior, #endif &sys_unique_checks }; @@ -520,6 +523,7 @@ struct show_var_st init_vars[]= { {"innodb_log_group_home_dir", (char*) &innobase_log_group_home_dir, SHOW_CHAR_PTR}, {"innodb_mirrored_log_groups", (char*) &innobase_mirrored_log_groups, SHOW_LONG}, {sys_innodb_max_dirty_pages_pct.name, (char*) &sys_innodb_max_dirty_pages_pct, SHOW_SYS}, + {sys_innodb_table_locks_old_behavior.name, (char*) &sys_innodb_table_locks_old_behavior, 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}, |