diff options
author | unknown <serg@serg.mylan> | 2005-02-09 20:04:28 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-02-09 20:04:28 +0100 |
commit | 9297872d75f4754df8bbf607e380fc6cf68251f1 (patch) | |
tree | e67ca6abbf7a9ea5ce41fb7435ffae76dbde21c8 /mysql-test/t/user_var.test | |
parent | be255d6577e5f20ba4bb72b44e7da8169b72197b (diff) | |
download | mariadb-git-9297872d75f4754df8bbf607e380fc6cf68251f1.tar.gz |
auto-ROLLBACK if binlog was not closed properly
auto-commit on Xid_log_event
client/mysqlbinlog.cc:
auto-ROLLBACK if binlog was not closed properly.
mysql-test/r/ctype_ucs.result:
results updated
mysql-test/r/mix_innodb_myisam_binlog.result:
results updated
mysql-test/r/mysqlbinlog2.result:
results updated
mysql-test/r/rpl_relayrotate.result:
results updated
mysql-test/r/user_var.result:
results updated
mysql-test/t/ctype_ucs.test:
finalize binlog before calling mysqlbinlog
mysql-test/t/user_var.test:
finalize binlog before calling mysqlbinlog
sql/log_event.cc:
commit at Xid_log_event
comments edited
sql/mysqld.cc:
free(0) fixed
sql/slave.cc:
rollback at fake Rotate_log_event
sql/sql_class.h:
no commit_or_rollback argument for binlog->write(THD *thd, IO_CACHE *cache)
sql/log.cc:
don't write "COMMIT" query, Xid_log_event is enough
sql/log_event.h:
more comments for LOG_EVENT_BINLOG_IN_USE_F
LOG_EVENT_FORCE_ROLLBACK_F added
sql/sql_repl.cc:
rollback at Rotate_log_event.
don't consider binlog corrupted if it was open when we read Formar_description but closed when we got to the end
sql/sql_repl.h:
style fix
Diffstat (limited to 'mysql-test/t/user_var.test')
-rw-r--r-- | mysql-test/t/user_var.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test index ee61cd10c3c..ffaafaaff25 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -110,6 +110,7 @@ INSERT INTO t1 VALUES(@`a b`); set @var1= "';aaa"; insert into t1 values (@var1); show binlog events from 96; +flush logs; # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we # absolutely need variables names to be quoted and strings to be # escaped). |