diff options
| author | unknown <paul@kite-hub.kitebird.com> | 2005-01-08 19:46:52 -0600 |
|---|---|---|
| committer | unknown <paul@kite-hub.kitebird.com> | 2005-01-08 19:46:52 -0600 |
| commit | e7b9581f367d9d5a13c947e801ec154d3db12cdb (patch) | |
| tree | d2889e305835cc5a4a203b1a895968089fc3cd4a | |
| parent | c6f3edbe887df2472119b5e15ad7d060d87b0035 (diff) | |
| parent | f8f7888b5ce63d363907d3ddb66b9900af92cd10 (diff) | |
| download | mariadb-git-e7b9581f367d9d5a13c947e801ec154d3db12cdb.tar.gz | |
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
| -rw-r--r-- | sql/set_var.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index f7b91c647a1..13e3d375448 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -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}, |