diff options
| author | unknown <sergefp@mysql.com> | 2004-04-14 23:49:47 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-04-14 23:49:47 +0400 |
| commit | 15e207b0e7d1cd010b9e0eea4663c98e1eb209de (patch) | |
| tree | fd10de2a780cdf0b6b112d4bc49b43bb4033342e /sql/mysqld.cc | |
| parent | e7c3e1587f291c9b1d69af4d333bf5333d7f1b9b (diff) | |
| parent | f10d01a747267e169d9f0b80d30a71b00f0bce7c (diff) | |
| download | mariadb-git-15e207b0e7d1cd010b9e0eea4663c98e1eb209de.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3db8101366e..2468deb2cc7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -370,7 +370,7 @@ KEY_CACHE *sql_key_cache; CHARSET_INFO *system_charset_info, *files_charset_info ; CHARSET_INFO *national_charset_info, *table_alias_charset; -SHOW_COMP_OPTION have_berkeley_db, have_innodb, have_isam; +SHOW_COMP_OPTION have_berkeley_db, have_innodb, have_isam, have_example_db; SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_query_cache; SHOW_COMP_OPTION have_crypt, have_compress; @@ -5124,6 +5124,11 @@ static void mysql_init_variables(void) #else have_isam=SHOW_OPTION_NO; #endif +#ifdef HAVE_EXAMPLE_DB + have_example_db= SHOW_OPTION_YES; +#else + have_example_db= SHOW_OPTION_NO; +#endif #ifdef USE_RAID have_raid=SHOW_OPTION_YES; #else |