Commit 66b56724 authored by unknown's avatar unknown
Browse files

Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 

into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0


sql/set_var.cc:
  Auto merged
parents e187468d f0e7abfc

sql/set_var.cc

+1 −1
Original line number Diff line number Diff line
@@ -964,9 +964,9 @@ struct show_var_st init_vars[]= { 
  {sys_optimizer_search_depth.name,(char*) &sys_optimizer_search_depth,

   SHOW_SYS},

  {"pid_file",                (char*) pidfile_name,                 SHOW_CHAR},

  {sys_prepared_stmt_count.name, (char*) &sys_prepared_stmt_count, SHOW_SYS},

  {"port",                    (char*) &mysqld_port,                  SHOW_INT},

  {sys_preload_buff_size.name, (char*) &sys_preload_buff_size,      SHOW_SYS},

  {sys_prepared_stmt_count.name, (char*) &sys_prepared_stmt_count, SHOW_SYS},

  {"protocol_version",        (char*) &protocol_version,            SHOW_INT},

  {sys_query_alloc_block_size.name, (char*) &sys_query_alloc_block_size,

   SHOW_SYS},