1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

merge with 4.0 for more memory allocation variables.

configure.in:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
scripts/Makefile.am:
  merge
sql/log_event.cc:
  merge
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
sql/set_var.cc:
  merge
sql/sql_class.h:
  merge
sql/sql_delete.cc:
  merge
sql/sql_parse.cc:
  merge
This commit is contained in:
unknown
2003-10-13 15:50:30 +03:00
21 changed files with 362 additions and 68 deletions

View File

@@ -392,10 +392,15 @@ struct system_variables
ulong table_type;
ulong tmp_table_size;
ulong tx_isolation;
/* Determines if which non-standard SQL behaviour should be enabled */
/* Determines which non-standard SQL behaviour should be enabled */
ulong sql_mode;
ulong default_week_format;
ulong max_seeks_for_key;
ulong range_alloc_block_size;
ulong query_alloc_block_size;
ulong query_prealloc_size;
ulong trans_alloc_block_size;
ulong trans_prealloc_size;
ulong group_concat_max_len;
/*
In slave thread we need to know in behalf of which