diff options
author | unknown <jani@ua72d24.elisa.omakaista.fi> | 2004-03-11 15:41:07 +0200 |
---|---|---|
committer | unknown <jani@ua72d24.elisa.omakaista.fi> | 2004-03-11 15:41:07 +0200 |
commit | 24f85213cdb65250fd9acc0c390dbcd9692918fc (patch) | |
tree | b93b6271754e63f34ca951a54407f897668fc6da /client | |
parent | 37678666549eb335c236776601c5294eba63788c (diff) | |
download | mariadb-git-24f85213cdb65250fd9acc0c390dbcd9692918fc.tar.gz |
Small fixes.
client/mysqlbinlog.cc:
Patched patch for Bug#2491.
sql/set_var.cc:
Added max_insert_delayed_threads into 'SHOW VARIABLES'.
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqlbinlog.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 9d9a414ad02..72f68f9fe86 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -306,6 +306,7 @@ int process_event(ulonglong *rec_count, char *last_db, Log_event *ev, my_off_t pos, int old_format) { char ll_buff[21]; + if ((*rec_count) >= offset) { if (!short_form) @@ -566,8 +567,6 @@ static MYSQL* safe_connect() if(!local_mysql) die("Failed on mysql_init"); - mysql_options(local_mysql, MYSQL_INIT_COMMAND, - "/*!32210 SET @@session.max_insert_delayed_threads=0*/"); if (!mysql_real_connect(local_mysql, host, user, pass, 0, port, sock, 0)) die("failed on connect: %s", mysql_error(local_mysql)); @@ -952,6 +951,8 @@ int main(int argc, char** argv) load_processor.init_by_cur_dir(); exit_value= 0; + fprintf(result_file, + "/*!40001 SET @@session.max_insert_delayed_threads=0*/;\n"); while (--argc >= 0) { if (dump_log_entries(*(argv++))) |