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.1806 05/04/18 16:02:08 stewart (AT) mysql (DOT) com +1 -0
Remove trailing whitespace in injector

sql/ha_ndbcluster.cc
1.211 05/04/18 16:02:00 stewart (AT) mysql (DOT) com +9 -9
Remove trailing whitespace in injector

# 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.210/sql/ha_ndbcluster.cc 2005-04-18 15:35:05 +10:00
+++ 1.211/sql/ha_ndbcluster.cc 2005-04-18 16:02:00 +10:00
@@ -7775,7 +7775,7 @@

NDBEVENT my_event(event_name);
my_event.setTable(*table);
- my_event.addTableEvent(NDBEVENT::TE_ALL);
+ my_event.addTableEvent(NDBEVENT::TE_ALL);

// add all columns to the event
for(int a= 0; a < table->getNoOfColumns(); a++)
@@ -7790,7 +7790,7 @@
* failed, print a warning
*/
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
- ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
+ ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
dict->getNdbError().code, dict->getNdbError().message,
"NDB");
#endif
@@ -7831,7 +7831,7 @@
}
#if 0
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
- ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
+ ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
0, "NDB Binlog: Removed trailing event",
"NDB");
#endif
@@ -7855,7 +7855,7 @@
dict->getNdbError().code,
dict->getNdbError().message);
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
- ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
+ ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
dict->getNdbError().code, dict->getNdbError().message,
"NDB");
ndb_error= dict->getNdbError();
@@ -7913,7 +7913,7 @@
sql_print_error("NDB Binlog: Creating NdbEventOperation failed for"
" %s",event_name);
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
- ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
+ ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
ndb->getNdbError().code, ndb->getNdbError().message,
"NDB");
DBUG_RETURN(-1);
@@ -8278,7 +8278,7 @@
row.gci= gci;
row.master_log_file= trans.start_pos().file_name();
row.master_log_pos= trans.start_pos().file_pos();
-
+
/**
* Commit transaction, start a new one
* FIXME: HANDLE ERRORS! Commit can fail!
@@ -8288,12 +8288,12 @@
add_binlog_index(thd, &row);
bzero((char*) &row,sizeof(row));
last_gci_in_binlog_index= gci;
-
+
trans= inj->new_trans(thd);
}
gci= pOp->getGCI();
}
-
+
const NDBTAB *ndbtab= pOp->getTable();
NDB_SHARE *share= (NDB_SHARE *)pOp->getCustomData();

@@ -8386,7 +8386,7 @@
row.gci= gci;
row.master_log_file= trans.start_pos().file_name();
row.master_log_pos= trans.start_pos().file_pos();
-
+
/**
* Commit transaction, start a new one
* FIXME: HANDLE ERRORS! Commit can fail!

--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?uns...ie.nctu.edu.tw