summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <konstantin@oak.local>2003-12-05 01:55:57 +0300
committerunknown <konstantin@oak.local>2003-12-05 01:55:57 +0300
commit997c4550f3f80edd3d6f36af45093b957665eede (patch)
tree4284913b8f4de96c4ead77ded76fa1eb5414d402
parent270b72ff4f5d59442800347be1db3ab7e3084c95 (diff)
downloadmariadb-git-997c4550f3f80edd3d6f36af45093b957665eede.tar.gz
unused variable max_prep_stmt_count removed
-rw-r--r--sql/mysqld.cc7
-rw-r--r--sql/set_var.cc4
-rw-r--r--sql/sql_class.h1
-rw-r--r--sql/unireg.h1
4 files changed, 1 insertions, 12 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 2a5f639a440..926d55313ec 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3597,7 +3597,7 @@ enum options_mysqld
OPT_MAX_SEEKS_FOR_KEY, OPT_MAX_TMP_TABLES, OPT_MAX_USER_CONNECTIONS,
OPT_MAX_LENGTH_FOR_SORT_DATA,
OPT_MAX_WRITE_LOCK_COUNT, OPT_BULK_INSERT_BUFFER_SIZE,
- OPT_MAX_ERROR_COUNT, OPT_MAX_PREP_STMT,
+ OPT_MAX_ERROR_COUNT,
OPT_MYISAM_BLOCK_SIZE, OPT_MYISAM_MAX_EXTRA_SORT_FILE_SIZE,
OPT_MYISAM_MAX_SORT_FILE_SIZE, OPT_MYISAM_SORT_BUFFER_SIZE,
OPT_NET_BUFFER_LENGTH, OPT_NET_RETRY_COUNT,
@@ -4386,11 +4386,6 @@ The minimum value for this variable is 4096.",
(gptr*) &global_system_variables.max_length_for_sort_data,
(gptr*) &max_system_variables.max_length_for_sort_data, 0, GET_ULONG,
REQUIRED_ARG, 1024, 4, 8192*1024L, 0, 1, 0},
- {"max_prepared_statements", OPT_MAX_PREP_STMT,
- "Max number of prepared_statements for a thread.",
- (gptr*) &global_system_variables.max_prep_stmt_count,
- (gptr*) &max_system_variables.max_prep_stmt_count, 0, GET_ULONG,
- REQUIRED_ARG, DEFAULT_PREP_STMT_COUNT, 0, ~0L, 0, 1, 0},
{"max_relay_log_size", OPT_MAX_RELAY_LOG_SIZE,
"If non-zero: relay log will be rotated automatically when the size exceeds this value; if zero (the default): when the size exceeds max_binlog_size. 0 expected, the minimum value for this variable is 4096.",
(gptr*) &max_relay_log_size, (gptr*) &max_relay_log_size, 0, GET_ULONG,
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 5b956cd9c76..e46fe9729d5 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -202,8 +202,6 @@ sys_var_thd_ha_rows sys_sql_max_join_size("sql_max_join_size",
&SV::max_join_size,
fix_max_join_size);
#endif
-sys_var_thd_ulong sys_max_prep_stmt_count("max_prepared_statements",
- &SV::max_prep_stmt_count);
sys_var_long_ptr sys_max_relay_log_size("max_relay_log_size",
&max_relay_log_size,
fix_max_relay_log_size);
@@ -462,7 +460,6 @@ sys_var *sys_variables[]=
&sys_max_heap_table_size,
&sys_max_join_size,
&sys_max_length_for_sort_data,
- &sys_max_prep_stmt_count,
&sys_max_relay_log_size,
&sys_max_seeks_for_key,
&sys_max_sort_length,
@@ -653,7 +650,6 @@ struct show_var_st init_vars[]= {
{sys_max_seeks_for_key.name, (char*) &sys_max_seeks_for_key, SHOW_SYS},
{sys_max_length_for_sort_data.name, (char*) &sys_max_length_for_sort_data,
SHOW_SYS},
- {sys_max_prep_stmt_count.name,(char*) &sys_max_prep_stmt_count, SHOW_SYS},
{sys_max_sort_length.name, (char*) &sys_max_sort_length, SHOW_SYS},
{sys_max_user_connections.name,(char*) &sys_max_user_connections, SHOW_SYS},
{sys_max_tmp_tables.name, (char*) &sys_max_tmp_tables, SHOW_SYS},
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 3ffff6f1871..1fce0049269 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -373,7 +373,6 @@ struct system_variables
ulong max_error_count;
ulong max_heap_table_size;
ulong max_length_for_sort_data;
- ulong max_prep_stmt_count;
ulong max_sort_length;
ulong max_tmp_tables;
ulong myisam_repair_threads;
diff --git a/sql/unireg.h b/sql/unireg.h
index 2da25edd72a..442809a9e08 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -84,7 +84,6 @@
#define TRANS_MEM_ROOT_PREALLOC 4096
#define DEFAULT_ERROR_COUNT 64
-#define DEFAULT_PREP_STMT_COUNT 64
#define EXTRA_RECORDS 10 /* Extra records in sort */
#define SCROLL_EXTRA 5 /* Extra scroll-rows. */
#define FIELD_NAME_USED ((uint) 32768) /* Bit set if fieldname used */