diff options
author | unknown <brian@zim.(none)> | 2005-03-24 16:08:48 -0800 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2005-03-24 16:08:48 -0800 |
commit | fe3beec4a439346d4d66bc3a975c920b96321566 (patch) | |
tree | 6d8d1b8770aad1266d083d417695c3eeca4752c3 /sql/set_var.cc | |
parent | cdf8e293d9e71ea00d346a4e29aeafe241ec6fc5 (diff) | |
parent | 5434defee5c15b729ae4abe8566dcf694bd33059 (diff) | |
download | mariadb-git-fe3beec4a439346d4d66bc3a975c920b96321566.tar.gz |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1
configure.in:
Auto merged
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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index d989c7d8fd2..9cf3dcac047 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -703,6 +703,7 @@ struct show_var_st init_vars[]= { {sys_group_concat_max_len.name, (char*) &sys_group_concat_max_len, SHOW_SYS}, {"have_archive", (char*) &have_archive_db, SHOW_HAVE}, {"have_bdb", (char*) &have_berkeley_db, SHOW_HAVE}, + {"have_blackhole_engine", (char*) &have_blackhole_db, SHOW_HAVE}, {"have_compress", (char*) &have_compress, SHOW_HAVE}, {"have_crypt", (char*) &have_crypt, SHOW_HAVE}, {"have_csv", (char*) &have_csv_db, SHOW_HAVE}, |