diff options
| author | unknown <svoj@april.(none)> | 2006-04-15 16:08:03 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-04-15 16:08:03 +0500 |
| commit | be4548d4a39c889bcf767b916fbf6aa45ca38a50 (patch) | |
| tree | 5929aebee733a9f462ca371f43a68c9063cd079b /sql/mysqld.cc | |
| parent | ac0ec77832ddff5508d5a99a81b51c46d6038b9b (diff) | |
| parent | a875afd6c9095b38b97a6c1fc8dbc9d1451d798c (diff) | |
| download | mariadb-git-be4548d4a39c889bcf767b916fbf6aa45ca38a50.tar.gz | |
Merge april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
into april.(none):/home/svoj/devel/mysql/BUG17917/mysql-5.0
sql/mysqld.cc:
Auto merged
myisam/mi_packrec.c:
Manual merge.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2c6a4a31c48..6440beefd85 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5677,7 +5677,7 @@ The minimum value for this variable is 4096.", (gptr*) &max_system_variables.max_length_for_sort_data, 0, GET_ULONG, REQUIRED_ARG, 1024, 4, 8192*1024L, 0, 1, 0}, {"max_prepared_stmt_count", OPT_MAX_PREPARED_STMT_COUNT, - "Maximum numbrer of prepared statements in the server.", + "Maximum number of prepared statements in the server.", (gptr*) &max_prepared_stmt_count, (gptr*) &max_prepared_stmt_count, 0, GET_ULONG, REQUIRED_ARG, 16382, 0, 1*1024*1024, 0, 1, 0}, {"max_relay_log_size", OPT_MAX_RELAY_LOG_SIZE, |