Commit 1e148ca4 authored by unknown's avatar unknown
Browse files

Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not... 

Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.


client/mysqlbinlog.cc:
  tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog)
mysql-test/r/ctype_ucs_binlog.result:
  update
mysql-test/r/mysqlbinlog.result:
  update
mysql-test/r/mysqlbinlog2.result:
  update
mysql-test/r/rpl_charset.result:
  update
mysql-test/r/rpl_timezone.result:
  update
mysql-test/r/user_var-binlog.result:
  update
parent 33313992

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ int main(int argc, char** argv) 
    of transaction.

  */

  fprintf(result_file,

          "# End of log file\nROLLBACK;\n"

          "# End of log file\nROLLBACK /* added by mysqlbinlog */;\n"

          "/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;\n");

  if (disable_log_bin)

    fprintf(result_file, "/*!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN*/;\n");

mysql-test/r/ctype_ucs_binlog.result

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t2 values (@v);

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

drop table t2;

mysql-test/r/mysqlbinlog.result

+10 −10
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-3-0' INTO table t1; 
SET TIMESTAMP=1000000000;

load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-4-0' INTO table t1;

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Broken LOAD DATA --
@@ -53,7 +53,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- --database --
@@ -62,7 +62,7 @@ ROLLBACK; 
ROLLBACK;

SET INSERT_ID=1;

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- --position --
@@ -75,7 +75,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Remote --
@@ -106,7 +106,7 @@ load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-3-2' INTO table t1; 
SET TIMESTAMP=1000000000;

load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-4-2' INTO table t1;

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Broken LOAD DATA --
@@ -119,7 +119,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- --database --
@@ -128,7 +128,7 @@ ROLLBACK; 
ROLLBACK;

SET INSERT_ID=1;

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- --position --
@@ -141,7 +141,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- reading stdin --
@@ -154,7 +154,7 @@ BEGIN; 
SET TIMESTAMP=1108844555;

insert t1 values (1);

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
@@ -164,6 +164,6 @@ BEGIN; 
SET TIMESTAMP=1108844555;

insert t1 values (1);

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

drop table t1, t2;

mysql-test/r/mysqlbinlog2.result

+25 −25
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ SET INSERT_ID=5; 
SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- offset --
@@ -67,7 +67,7 @@ SET INSERT_ID=5; 
SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-position --
@@ -84,7 +84,7 @@ SET INSERT_ID=5; 
SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-position --
@@ -107,7 +107,7 @@ SET INSERT_ID=3; 
SET TIMESTAMP=1579609944;

insert into t1 values(null, "c");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-datetime --
@@ -128,7 +128,7 @@ SET INSERT_ID=5; 
SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-datetime --
@@ -148,7 +148,7 @@ SET INSERT_ID=2; 
SET TIMESTAMP=1579609942;

insert into t1 values(null, "b");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Local with 2 binlogs on command line --
@@ -184,7 +184,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- offset --
@@ -218,7 +218,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-position --
@@ -242,7 +242,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-position --
@@ -272,7 +272,7 @@ SET TIMESTAMP=1579609946; 
insert into t1 values(null, "e");

SET INSERT_ID=6;

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-datetime --
@@ -300,7 +300,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-datetime --
@@ -320,7 +320,7 @@ SET INSERT_ID=2; 
SET TIMESTAMP=1579609942;

insert into t1 values(null, "b");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Remote --
@@ -349,7 +349,7 @@ SET INSERT_ID=5; 
SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- offset --
@@ -376,7 +376,7 @@ SET INSERT_ID=5; 
SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-position --
@@ -393,7 +393,7 @@ SET INSERT_ID=5; 
SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-position --
@@ -416,7 +416,7 @@ SET INSERT_ID=3; 
SET TIMESTAMP=1579609944;

insert into t1 values(null, "c");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-datetime --
@@ -437,7 +437,7 @@ SET INSERT_ID=5; 
SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-datetime --
@@ -457,7 +457,7 @@ SET INSERT_ID=2; 
SET TIMESTAMP=1579609942;

insert into t1 values(null, "b");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Remote with 2 binlogs on command line --
@@ -493,7 +493,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- offset --
@@ -527,7 +527,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-position --
@@ -551,7 +551,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-position --
@@ -581,7 +581,7 @@ SET TIMESTAMP=1579609946; 
insert into t1 values(null, "e");

SET INSERT_ID=6;

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-datetime --
@@ -609,7 +609,7 @@ SET @@session.sql_mode=0; 
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-datetime --
@@ -629,7 +629,7 @@ SET INSERT_ID=2; 
SET TIMESTAMP=1579609942;

insert into t1 values(null, "b");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- to-last-log --
@@ -661,7 +661,7 @@ SET INSERT_ID=6; 
SET TIMESTAMP=1579609943;

insert into t1 values(null, "f");

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- end of test --

mysql-test/r/rpl_charset.result

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ SET TIMESTAMP=1000000000; 
SET @@session.character_set_client=7,@@session.collation_connection=51,@@session.collation_server=30;

INSERT INTO t1 (c1, c2) VALUES (',  ',',  ');

# End of log file

ROLLBACK;

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

drop table t1;

create table `t1` (