bk commit into 5.0 tree (serg:1.1874)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1874 05/04/05 14:46:18 serg@stripped +2 -0
  sql/item.cc
      after merge fix
  sql/mysqld.cc
      too early for sync-binlog=1 by default :)

  sql/mysqld.cc
    1.449 05/04/05 14:46:04 serg@stripped +1 -1
    too early for sync-binlog=1 by default :)

  sql/item.cc
    1.133 05/04/05 14:46:04 serg@stripped +1 -1
    after merge fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.132/sql/item.cc	Mon Apr  4 15:43:20 2005
+++ 1.133/sql/item.cc	Tue Apr  5 14:46:04 2005
@@ -1496,7 +1496,7 @@
   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

--- 1.448/sql/mysqld.cc	Tue Apr  5 13:22:04 2005
+++ 1.449/sql/mysqld.cc	Tue Apr  5 14:46:04 2005
@@ -5467,7 +5467,7 @@
    "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},