Commit a875afd6 authored by unknown's avatar unknown
Browse files

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1
parents 970d28ef 403e6783

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5253,7 +5253,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,