From 71811298b9387b4af58baf762b3e5651d93d93d4 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Tue, 5 Apr 2005 14:46:18 +0200
Subject: [PATCH] sql/item.cc     after merge fix sql/mysqld.cc     too early
 for sync-binlog=1 by default :)

---
 sql/item.cc   | 2 +-
 sql/mysqld.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/item.cc b/sql/item.cc
index 1572efb0f23..d3abc40eb29 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1496,7 +1496,7 @@ longlong Item_string::val_int()
   char *org_end= end;
   CHARSET_INFO *cs= str_value.charset();
 
-  tmp= (*(cs->cset->my_strtoll10))(cs, str_value.ptr(), &end, &err);
+  tmp= (*(cs->cset->strtoll10))(cs, str_value.ptr(), &end, &err);
   /*
     TODO: Give error if we wanted a signed integer and we got an unsigned
     one
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ba149e5cee6..ecf2094eb18 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5467,7 +5467,7 @@ The minimum value for this variable is 4096.",
    "Synchronously flush binary log to disk after every #th event. "
    "Use 0 (default) to disable synchronous flushing.",
    (gptr*) &sync_binlog_period, (gptr*) &sync_binlog_period, 0, GET_ULONG,
-   REQUIRED_ARG, 1, 0, ~0L, 0, 1, 0},
+   REQUIRED_ARG, 0, 0, ~0L, 0, 1, 0},
   {"sync-frm", OPT_SYNC_FRM, "Sync .frm to disk on create. Enabled by default.",
    (gptr*) &opt_sync_frm, (gptr*) &opt_sync_frm, 0, GET_BOOL, NO_ARG, 1, 0,
    0, 0, 0, 0},