sql/item.cc

after merge fix
sql/mysqld.cc
    too early for sync-binlog=1 by default :)
This commit is contained in:
serg@serg.mylan 2005-04-05 14:46:18 +02:00
parent c796ea598c
commit 71811298b9
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -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},