database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples
This commit is contained in:
brian@brian-akers-computer.local
2004-04-14 11:59:51 -04:00
parent 7736a18801 4d5a8cb78c
commit 86952cd9a6
12 changed files with 451 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/mysqld.cc
View File

@ -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;
@ -5121,6 +5121,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