Skip to content

M
MariaDB
Commit e62bb5d5 authored by unknown's avatar unknown
Browse files
Options

Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  damien-katzs-computer.local:/Users/dkatz/mysql51
parents 7cc7e3f4 43d25648
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 114 deletions
mysql-test/suite/binlog/r/binlog_row_binlog.result
View file @ e62bb5d5
...@@ -258,117 +258,8 @@ master-bin.000001 419 Table_map 1 458 table_id: # (test.t1) ...@@ -258,117 +258,8 @@ master-bin.000001 419 Table_map 1 458 table_id: # (test.t1)
master-bin.000001 458 Write_rows 1 492 table_id: # flags: STMT_END_F master-bin.000001 458 Write_rows 1 492 table_id: # flags: STMT_END_F
master-bin.000001 492 Xid 1 519 COMMIT /* XID */ master-bin.000001 492 Xid 1 519 COMMIT /* XID */
master-bin.000001 519 Query 1 595 use `test`; drop table t1 master-bin.000001 519 Query 1 595 use `test`; drop table t1
set autocommit= 1;
reset master;
create table t1(n int) engine=innodb;
insert into t1 values (1);
insert into t1 values (2);
insert into t1 values (3);
commit;
drop table t1;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4
master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb
master-bin.000001 205 Table_map 1 244 table_id: # (test.t1)
master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F
master-bin.000001 278 Xid 1 305 COMMIT /* XID */
master-bin.000001 305 Table_map 1 344 table_id: # (test.t1)
master-bin.000001 344 Write_rows 1 378 table_id: # flags: STMT_END_F
master-bin.000001 378 Xid 1 405 COMMIT /* XID */
master-bin.000001 405 Table_map 1 444 table_id: # (test.t1)
master-bin.000001 444 Write_rows 1 478 table_id: # flags: STMT_END_F
master-bin.000001 478 Xid 1 505 COMMIT /* XID */
master-bin.000001 505 Query 1 581 use `test`; drop table t1
reset master;
create table t1(n int) engine=myisam;
begin;
insert into t1 values (4);
insert into t1 values (5);
insert into t1 values (6);
commit;
drop table t1;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4
master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=myisam
master-bin.000001 205 Table_map 1 244 table_id: # (test.t1)
master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F
master-bin.000001 278 Table_map 1 317 table_id: # (test.t1)
master-bin.000001 317 Write_rows 1 351 table_id: # flags: STMT_END_F
master-bin.000001 351 Table_map 1 390 table_id: # (test.t1)
master-bin.000001 390 Write_rows 1 424 table_id: # flags: STMT_END_F
master-bin.000001 424 Query 1 500 use `test`; drop table t1
set autocommit= 1;
reset master;
create table t1(n int) engine=innodb;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 205
insert into t1 values (1);
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 305
insert into t1 values (2);
insert into t1 values (3);
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 505
commit;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 505
drop table t1;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4
master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb
master-bin.000001 205 Table_map 1 244 table_id: # (test.t1)
master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F
master-bin.000001 278 Xid 1 305 COMMIT /* XID */
master-bin.000001 305 Table_map 1 344 table_id: # (test.t1)
master-bin.000001 344 Write_rows 1 378 table_id: # flags: STMT_END_F
master-bin.000001 378 Xid 1 405 COMMIT /* XID */
master-bin.000001 405 Table_map 1 444 table_id: # (test.t1)
master-bin.000001 444 Write_rows 1 478 table_id: # flags: STMT_END_F
master-bin.000001 478 Xid 1 505 COMMIT /* XID */
master-bin.000001 505 Query 1 581 use `test`; drop table t1
set autocommit= 0;
reset master;
create table t1(n int) engine=myisam;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 205
insert into t1 values (4);
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 278
insert into t1 values (5);
insert into t1 values (6);
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 424
commit;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 424
drop table t1;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4
master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=myisam
master-bin.000001 205 Table_map 1 244 table_id: # (test.t1)
master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F
master-bin.000001 278 Table_map 1 317 table_id: # (test.t1)
master-bin.000001 317 Write_rows 1 351 table_id: # flags: STMT_END_F
master-bin.000001 351 Table_map 1 390 table_id: # (test.t1)
master-bin.000001 390 Write_rows 1 424 table_id: # flags: STMT_END_F
master-bin.000001 424 Query 1 500 use `test`; drop table t1
set session autocommit = @ac;
set @bcs = @@binlog_cache_size; set @bcs = @@binlog_cache_size;
set @ac = @@autocommit;
set global binlog_cache_size=4096; set global binlog_cache_size=4096;
set autocommit= 0;
reset master; reset master;
create table t1 (a int) engine=innodb; create table t1 (a int) engine=innodb;
show binlog events from 0; show binlog events from 0;
......
sql/slave.cc
View file @ e62bb5d5
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <my_dir.h> #include <my_dir.h>
#include <sql_common.h> #include <sql_common.h>
#include <errmsg.h> #include <errmsg.h>
#include <mysys_err.h>
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION
...@@ -2204,20 +2205,23 @@ reading event")) ...@@ -2204,20 +2205,23 @@ reading event"))
if (event_len == packet_error) if (event_len == packet_error)
{ {
uint mysql_error_number= mysql_errno(mysql); uint mysql_error_number= mysql_errno(mysql);
if (mysql_error_number == CR_NET_PACKET_TOO_LARGE) switch (mysql_error_number) {
{ case CR_NET_PACKET_TOO_LARGE:
sql_print_error("\ sql_print_error("\
Log entry on master is longer than max_allowed_packet (%ld) on \ Log entry on master is longer than max_allowed_packet (%ld) on \
slave. If the entry is correct, restart the server with a higher value of \ slave. If the entry is correct, restart the server with a higher value of \
max_allowed_packet", max_allowed_packet",
thd->variables.max_allowed_packet); thd->variables.max_allowed_packet);
goto err; goto err;
} case ER_MASTER_FATAL_ERROR_READING_BINLOG:
if (mysql_error_number == ER_MASTER_FATAL_ERROR_READING_BINLOG)
{
sql_print_error(ER(mysql_error_number), mysql_error_number, sql_print_error(ER(mysql_error_number), mysql_error_number,
mysql_error(mysql)); mysql_error(mysql));
goto err; goto err;
case EE_OUTOFMEMORY:
case ER_OUTOFMEMORY:
sql_print_error("\
Stopping slave I/O thread due to out-of-memory error from master");
goto err;
} }
if (try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings, if (try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings,
reconnect_messages[SLAVE_RECON_ACT_EVENT])) reconnect_messages[SLAVE_RECON_ACT_EVENT]))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7