database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Add supression for expected warning(s) in slaves error log

Browse Source
This commit is contained in:
unknown
2008-04-27 16:13:08 +02:00
parent 99ee0572c0
commit 8343c36854
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/rpl/r/rpl_temporary.result
View File

@@ -4,6 +4,7 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
call mtr.add_supression("Slave: Can\'t find record in \'user\' Error_code: 1032");
reset master; reset master;
SET @save_select_limit=@@session.sql_select_limit; SET @save_select_limit=@@session.sql_select_limit;
SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100; SET @@session.sql_select_limit=10, @@session.pseudo_thread_id=100;

4
mysql-test/suite/rpl/t/rpl_temporary.test
View File

@@ -16,6 +16,10 @@ source include/add_anonymous_users.inc;
# (otherwise RESET MASTER may come too early). # (otherwise RESET MASTER may come too early).
save_master_pos; save_master_pos;
connection slave; connection slave;
# Add supression for expected warning(s) in slaves error log
call mtr.add_supression("Slave: Can\'t find record in \'user\' Error_code: 1032");
sync_with_master; sync_with_master;
reset master; reset master;
connection master; connection master;

2
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
View File

@@ -551,7 +551,7 @@ Dbtc::execDROP_TAB_REQ(Signal* signal)
Uint32 senderRef = req->senderRef; Uint32 senderRef = req->senderRef;
Uint32 senderData = req->senderData; Uint32 senderData = req->senderData;
DropTabReq::RequestType rt = (DropTabReq::RequestType)req->requestType; DropTabReq::RequestType rt = (DropTabReq::RequestType)req->requestType;
abort();
if(!tabPtr.p->get_enabled() && rt == DropTabReq::OnlineDropTab){ if(!tabPtr.p->get_enabled() && rt == DropTabReq::OnlineDropTab){
jam(); jam();
DropTabRef* ref = (DropTabRef*)signal->getDataPtrSend(); DropTabRef* ref = (DropTabRef*)signal->getDataPtrSend();