diff options
| author | unknown <jani@ua72d24.elisa.omakaista.fi> | 2004-03-04 17:58:36 +0000 |
|---|---|---|
| committer | unknown <jani@ua72d24.elisa.omakaista.fi> | 2004-03-04 17:58:36 +0000 |
| commit | 52236ae1e1485a39110834abf8b61d2de1ed2815 (patch) | |
| tree | 9e9896821fbad442c2079c187c49119f392976b8 /client/mysqlbinlog.cc | |
| parent | b60519406e5e156c3ddce45569a8d5dd82d8eb53 (diff) | |
| download | mariadb-git-52236ae1e1485a39110834abf8b61d2de1ed2815.tar.gz | |
Fixed Bug#2491, INSERT DELAYED causes binary log unusable by mysqlbinlog (replication is ok)
Setting insert delayed threads = 0 at mysql_init_command.
sql/mysql_priv.h:
New session variable, max_insert_delayed_threads
sql/mysqld.cc:
New session variable, max_insert_delayed_threads
sql/set_var.cc:
New session variable, max_insert_delayed_threads
sql/sql_class.h:
New session variable, max_insert_delayed_threads
sql/sql_insert.cc:
New session variable, max_insert_delayed_threads
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 1be4b3754d0..9d9a414ad02 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -480,7 +480,7 @@ static void die(const char* fmt, ...) static void print_version() { - printf("%s Ver 2.5 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE); + printf("%s Ver 2.6 for %s at %s\n", my_progname, SYSTEM_TYPE, MACHINE_TYPE); } @@ -562,9 +562,12 @@ static int parse_args(int *argc, char*** argv) static MYSQL* safe_connect() { MYSQL *local_mysql = mysql_init(NULL); + 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)); |