diff options
| author | unknown <jan@hundin.mysql.fi> | 2004-07-29 09:04:50 +0300 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2004-07-29 09:04:50 +0300 |
| commit | b2f54294c5000cc2ca5ffe30c241812a134f9464 (patch) | |
| tree | 989bed9806b3994beb3360ea5cdb24d72ad96fcc /sql/set_var.cc | |
| parent | 54d12591a808e19c5816d0bf492547a2c51b691d (diff) | |
| parent | 805f5aa186640bc6a7449e1affb6106b7ee53b32 (diff) | |
| download | mariadb-git-b2f54294c5000cc2ca5ffe30c241812a134f9464.tar.gz | |
Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index fb9ff285859..e70fdaedb29 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -611,8 +611,8 @@ struct show_var_st init_vars[]= { #ifdef HAVE_BERKELEY_DB {"bdb_cache_size", (char*) &berkeley_cache_size, SHOW_LONG}, {"bdb_home", (char*) &berkeley_home, SHOW_CHAR_PTR}, - {"bdb_logdir", (char*) &berkeley_logdir, SHOW_CHAR_PTR}, {"bdb_log_buffer_size", (char*) &berkeley_log_buffer_size, SHOW_LONG}, + {"bdb_logdir", (char*) &berkeley_logdir, SHOW_CHAR_PTR}, {"bdb_max_lock", (char*) &berkeley_max_lock, SHOW_LONG}, {"bdb_shared_data", (char*) &berkeley_shared_data, SHOW_BOOL}, {"bdb_tmpdir", (char*) &berkeley_tmpdir, SHOW_CHAR_PTR}, @@ -652,9 +652,9 @@ struct show_var_st init_vars[]= { {"have_bdb", (char*) &have_berkeley_db, SHOW_HAVE}, {"have_compress", (char*) &have_compress, SHOW_HAVE}, {"have_crypt", (char*) &have_crypt, SHOW_HAVE}, + {"have_geometry", (char*) &have_geometry, SHOW_HAVE}, {"have_innodb", (char*) &have_innodb, SHOW_HAVE}, {"have_isam", (char*) &have_isam, SHOW_HAVE}, - {"have_geometry", (char*) &have_geometry, SHOW_HAVE}, {"have_ndbcluster", (char*) &have_ndbcluster, SHOW_HAVE}, {"have_openssl", (char*) &have_openssl, SHOW_HAVE}, {"have_query_cache", (char*) &have_query_cache, SHOW_HAVE}, |