diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-05-05 20:41:58 +0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-05-05 20:41:58 +0200 |
| commit | 6bee08c61dbb89837edc04de8e49fed411f17770 (patch) | |
| tree | 119a0053bfa574d7efee096e23cb467bdfdcea52 /sql/set_var.cc | |
| parent | e9f38910daa8feb7e916773a43f8bd50c6ffc2ef (diff) | |
| parent | 75da023da6aea082d30d100e95052bb56738d25b (diff) | |
| download | mariadb-git-6bee08c61dbb89837edc04de8e49fed411f17770.tar.gz | |
Merge from 5.0-pe-stage into main.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 735bb5279bd..14ec2e57aab 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -450,6 +450,9 @@ sys_var_thd_bool sys_innodb_table_locks("innodb_table_locks", &SV::innodb_table_locks); sys_var_thd_bool sys_innodb_support_xa("innodb_support_xa", &SV::innodb_support_xa); +sys_var_bool_ptr sys_innodb_use_legacy_cardinality_algorithm( + "innodb_use_legacy_cardinality_algorithm", + &srv_use_legacy_cardinality_algorithm); 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", @@ -804,6 +807,7 @@ sys_var *sys_variables[]= &sys_innodb_max_purge_lag, &sys_innodb_table_locks, &sys_innodb_support_xa, + &sys_innodb_use_legacy_cardinality_algorithm, &sys_innodb_autoextend_increment, &sys_innodb_sync_spin_loops, &sys_innodb_concurrency_tickets, @@ -946,6 +950,8 @@ 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_use_legacy_cardinality_algorithm.name, + (char*) &sys_innodb_use_legacy_cardinality_algorithm, 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}, |