1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove ^M's

Browse Source 
compile even without InnoDB
This commit is contained in:
serg@serg.mylan 2004-06-25 11:33:03 +02:00
parent f6ea88e8a3
commit 3452445559
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/t/system_mysql_db_fix.test
View File

@ -80,3 +80,4 @@ DROP TABLE help_relation;
DROP TABLE help_topic; DROP TABLE help_topic;
-- enable_query_log -- enable_query_log

1
mysql-test/t/system_mysql_db_refs.test
View File

@ -99,3 +99,4 @@ drop table test_func;
drop table test_host; drop table test_host;
drop table test_user; drop table test_user;
drop table test_db; drop table test_db;

2
sql/mysqld.cc
View File

@ -2532,6 +2532,7 @@ server.");
if (have_innodb != SHOW_OPTION_YES) if (have_innodb != SHOW_OPTION_YES)
sql_print_error("Warning: --innodb-safe-binlog is meaningful only if " sql_print_error("Warning: --innodb-safe-binlog is meaningful only if "
"the InnoDB storage engine is enabled in the server."); "the InnoDB storage engine is enabled in the server.");
#ifdef HAVE_INNOBASE_DB
if (innobase_flush_log_at_trx_commit != 1) if (innobase_flush_log_at_trx_commit != 1)
{ {
sql_print_error("Warning: --innodb-safe-binlog is meaningful only if " sql_print_error("Warning: --innodb-safe-binlog is meaningful only if "
@ -2558,6 +2559,7 @@ server.");
"to 1."); "to 1.");
sync_binlog_period= 1; sync_binlog_period= 1;
} }
#endif
} }
if (ha_init()) if (ha_init())