Commit 87c7a741 authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into lmy004.:/work/mysql-5.1-bdb_region


sql/mysqld.cc:
  Auto merged
parents a80ba53e f3f4a51f

sql/mysqld.cc

+4 −4
Original line number Diff line number Diff line
@@ -5400,14 +5400,14 @@ log and this option does nothing anymore.", 
    (gptr*) &back_log, (gptr*) &back_log, 0, GET_ULONG,

    REQUIRED_ARG, 50, 1, 65535, 0, 1, 0 },

#ifdef WITH_BERKELEY_STORAGE_ENGINE

  { "bdb_cache_size", OPT_BDB_CACHE_SIZE,

    "The buffer that is allocated to cache index and rows for BDB tables.",

    (gptr*) &berkeley_cache_size, (gptr*) &berkeley_cache_size, 0, GET_ULL,

    REQUIRED_ARG, KEY_CACHE_SIZE, 20*1024, (ulonglong) ~0, 0, IO_SIZE, 0},

  { "bdb_cache_parts", OPT_BDB_CACHE_PARTS,

    "Number of parts to use for BDB cache.",

    (gptr*) &berkeley_cache_parts, (gptr*) &berkeley_cache_parts, 0, GET_ULONG,

    REQUIRED_ARG, 1, 1, 1024, 0, 1, 0},

  { "bdb_cache_size", OPT_BDB_CACHE_SIZE,

    "The buffer that is allocated to cache index and rows for BDB tables.",

    (gptr*) &berkeley_cache_size, (gptr*) &berkeley_cache_size, 0, GET_ULL,

    REQUIRED_ARG, KEY_CACHE_SIZE, 20*1024, (ulonglong) ~0, 0, IO_SIZE, 0},

  /* QQ: The following should be removed soon! (bdb_max_lock preferred) */

  {"bdb_lock_max", OPT_BDB_MAX_LOCK, "Synonym for bdb_max_lock.",

   (gptr*) &berkeley_max_lock, (gptr*) &berkeley_max_lock, 0, GET_ULONG,

sql/set_var.cc

+1 −1
Original line number Diff line number Diff line
@@ -624,8 +624,8 @@ struct show_var_st init_vars[]= { 
  {sys_automatic_sp_privileges.name,(char*) &sys_automatic_sp_privileges,       SHOW_SYS},

  {"back_log",                (char*) &back_log,                    SHOW_LONG},

  {"basedir",                 mysql_home,                           SHOW_CHAR},

  {"bdb_cache_size",          (char*) &berkeley_cache_size,         SHOW_LONGLONG},

  {"bdb_cache_parts",         (char*) &berkeley_cache_parts,        SHOW_LONG},

  {"bdb_cache_size",          (char*) &berkeley_cache_size,         SHOW_LONGLONG},

  {"bdb_home",                (char*) &berkeley_home,               SHOW_CHAR_PTR},

  {"bdb_log_buffer_size",     (char*) &berkeley_log_buffer_size,    SHOW_LONG},

  {"bdb_logdir",              (char*) &berkeley_logdir,             SHOW_CHAR_PTR},