Commit 76bd00a9 authored by unknown's avatar unknown
Browse files

After merge fix for bug N22645 


mysql-test/t/mysqlbinlog.test:
  After merge fix
sql/log_event.cc:
  Fixing comment, thanks to Andrei for suggestion
parent c8b678ac

mysql-test/t/mysqlbinlog.test

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ call p1(); 
drop procedure p1;

--error 1305

call p1();

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009 | $MYSQL

call p1();

drop procedure p1;

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ bool Query_log_event::write(IO_CACHE* file) 
            1+4+           // code of autoinc and the 2 autoinc variables

            1+6+           // code of charset and charset

            1+1+MAX_TIME_ZONE_NAME_LENGTH+ // code of tz and tz length and tz name

            1+2            // code of lc_time_names and lc_time_names

            1+2            // code of lc_time_names and lc_time_names_number

            ], *start, *start_of_status;

  ulong event_length;