Commit e7b9581f authored by unknown's avatar unknown
Browse files

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

into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0


sql/set_var.cc:
  Auto merged
parents c6f3edbe f8f7888b

sql/set_var.cc

+0 −1
Original line number Diff line number Diff line
@@ -758,7 +758,6 @@ struct show_var_st init_vars[]= { 
  {"innodb_log_group_home_dir", (char*) &innobase_log_group_home_dir, SHOW_CHAR_PTR},

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

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

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

  {"innodb_mirrored_log_groups", (char*) &innobase_mirrored_log_groups, SHOW_LONG},

  {"innodb_open_files", (char*) &innobase_open_files, SHOW_LONG },

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