diff --git a/sql/mysqld.cc b/sql/mysqld.cc index da02b952f3c..2e6d88ef0a4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -528,10 +528,6 @@ my_decimal decimal_zero; */ ulong max_long_data_size; -/* Limits for internal temporary tables (MyISAM or Aria) */ -uint internal_tmp_table_max_key_length; -uint internal_tmp_table_max_key_segments; - bool max_user_connections_checking=0; /** Limit of the total number of prepared statements in the server. @@ -5151,11 +5147,6 @@ a file name for --log-bin-index option", opt_binlog_index_name); sql_print_error("Aria engine is not enabled or did not start. The Aria engine must be enabled to continue as mysqld was configured with --with-aria-tmp-tables"); unireg_abort(1); } - internal_tmp_table_max_key_length= maria_max_key_length(); - internal_tmp_table_max_key_segments= maria_max_key_segments(); -#else - internal_tmp_table_max_key_length= myisam_max_key_length(); - internal_tmp_table_max_key_segments= myisam_max_key_segments(); #endif #ifdef WITH_WSREP diff --git a/sql/mysqld.h b/sql/mysqld.h index 71d586cc4c1..bfce719a280 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -758,9 +758,6 @@ extern ulong binlog_checksum_options; extern bool max_user_connections_checking; extern ulong opt_binlog_dbug_fsync_sleep; -extern uint internal_tmp_table_max_key_length; -extern uint internal_tmp_table_max_key_segments; - extern uint volatile global_disable_checkpoint; extern my_bool opt_help;