remove ^M's

compile even without InnoDB

mysql-test/t/system_mysql_db_fix.test

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

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;
+

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())