bk commit into 5.1 tree (stewart:1.1805) -
04-19-2005
, 04:50 PM
Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/in...urce-tree.html
ChangeSet
1.1805 05/04/18 15:35:13 stewart (AT) mysql (DOT) com +1 -0
WL2325 NDB Injector thread
Display errors on failure of create_event(ops)
sql/ha_ndbcluster.cc
1.210 05/04/18 15:35:05 stewart (AT) mysql (DOT) com +12 -3
Injector: Display errors on failure of create_event(ops)
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: stewart
# Host: kennedy.(none)
# Root: /home/stewart/Documents/MySQL/5.1/wl2325
--- 1.209/sql/ha_ndbcluster.cc 2005-04-18 11:45:24 +10:00
+++ 1.210/sql/ha_ndbcluster.cc 2005-04-18 15:35:05 +10:00
@@ -3970,8 +3970,11 @@
if (ndbcluster_create_event_ops(injector_ndb, share, ndbtab,
event_name.c_ptr()) < 0)
{
+ sql_print_error("NDB Binlog:"
+ "FAILED CREATE (DISCOVER) EVENT OPERATIONS Event: %s",
+ event_name.c_ptr());
+ /* TODO: Handle the error? */
free_share(&share);
- ; /* ToDo: handle error? */
DBUG_RETURN(0);
}
// keep lock on share, injector thread now has responsability
@@ -4096,12 +4099,14 @@
"allocating table share for %s failed", name2);
break; // error
}
-
+
if (ndbcluster_create_event_ops(injector_ndb, share, t,
event_name.c_ptr() ) < 0)
{
free_share(&share);
/* ToDo; handle error? */
+ sql_print_error("NDB Binlog: FAILED CREATE TABLE event operations."
+ " Event: %s", name2);
break; // error
}
break; // ok
@@ -4283,7 +4288,7 @@
ndb_rep_event_name(&event_name,from+sizeof(share_p refix)-1,0);
replication_handle_drop_table(ndb, event_name.c_ptr(), share);
}
-
+
if( !result && new_tabname[0] != '#')
{
/* always create an event for the table */
@@ -4304,12 +4309,16 @@
else
{
/* ToDo; handle error? */
+ sql_print_error("NDB Binlog: FAILED create event operations "
+ "during RENAME. Event %s", event_name.c_ptr());
}
}
}
else
{
/* ToDo; handle error? */
+ sql_print_error("NDB Binlog: FAILED create event during RENAME."
+ "Event: %s",event_name.c_ptr());
}
}
if (share)
--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw |