Commit 5a305ab5 authored by unknown's avatar unknown

remove ^M's

compile even without InnoDB


mysql-test/t/system_mysql_db_fix.test:
  remove ^M's
mysql-test/t/system_mysql_db_refs.test:
  remove ^M's
sql/mysqld.cc:
  compile even without InnoDB !
parent d1e43051
...@@ -80,3 +80,4 @@ DROP TABLE help_relation; ...@@ -80,3 +80,4 @@ DROP TABLE help_relation;
DROP TABLE help_topic; DROP TABLE help_topic;
-- enable_query_log -- enable_query_log
...@@ -99,3 +99,4 @@ drop table test_func; ...@@ -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;
...@@ -2532,6 +2532,7 @@ server."); ...@@ -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."); ...@@ -2558,6 +2559,7 @@ server.");
"to 1."); "to 1.");
sync_binlog_period= 1; sync_binlog_period= 1;
} }
#endif
} }
if (ha_init()) if (ha_init())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment