From 3452445559ed2e104000f4ea88e2c20f371674ea Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Fri, 25 Jun 2004 11:33:03 +0200
Subject: [PATCH] remove ^M's compile even without InnoDB

---
 mysql-test/t/system_mysql_db_fix.test  | 1 +
 mysql-test/t/system_mysql_db_refs.test | 1 +
 sql/mysqld.cc                          | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/mysql-test/t/system_mysql_db_fix.test b/mysql-test/t/system_mysql_db_fix.test
index 41fbdec84e7..a81772c74e4 100644
--- a/mysql-test/t/system_mysql_db_fix.test
+++ b/mysql-test/t/system_mysql_db_fix.test
@@ -80,3 +80,4 @@ DROP TABLE help_relation;
 DROP TABLE help_topic;
 
 -- enable_query_log
+
diff --git a/mysql-test/t/system_mysql_db_refs.test b/mysql-test/t/system_mysql_db_refs.test
index 62d6f3de944..4c6557ba5c7 100644
--- a/mysql-test/t/system_mysql_db_refs.test
+++ b/mysql-test/t/system_mysql_db_refs.test
@@ -99,3 +99,4 @@ drop table test_func;
 drop table test_host;
 drop table test_user;
 drop table test_db;
+
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 6099feaaa30..08729e3e378 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2532,6 +2532,7 @@ server.");
     if (have_innodb != SHOW_OPTION_YES)
       sql_print_error("Warning: --innodb-safe-binlog is meaningful only if "
                       "the InnoDB storage engine is enabled in the server.");
+#ifdef HAVE_INNOBASE_DB
     if (innobase_flush_log_at_trx_commit != 1)
     {
       sql_print_error("Warning: --innodb-safe-binlog is meaningful only if "
@@ -2558,6 +2559,7 @@ server.");
                       "to 1.");
       sync_binlog_period= 1;
     }
+#endif
   }
 
   if (ha_init())