bk commit into 5.1 tree (tomas:1.2458)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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/installing-source-tree.html

ChangeSet
  1.2458 07/03/08 01:43:14 tomas@stripped +1 -0
  Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-6.1_2
  into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-merge

  sql/ha_ndbcluster_binlog.cc
    1.105 07/03/08 01:43:02 tomas@stripped +0 -0
    Auto merged

# 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:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-merge/RESYNC

--- 1.104/sql/ha_ndbcluster_binlog.cc	2007-02-28 00:31:46 +07:00
+++ 1.105/sql/ha_ndbcluster_binlog.cc	2007-03-08 01:43:02 +07:00
@@ -729,6 +729,9 @@ static int ndbcluster_create_ndb_apply_s
                    NDB_REP_DB "." NDB_APPLY_TABLE
                    " ( server_id INT UNSIGNED NOT NULL,"
                    " epoch BIGINT UNSIGNED NOT NULL, "
+                   " log_name VARCHAR(255) BINARY NOT NULL, "
+                   " start_pos BIGINT UNSIGNED NOT NULL, "
+                   " end_pos BIGINT UNSIGNED NOT NULL, "
                    " PRIMARY KEY USING HASH (server_id) ) ENGINE=NDB");
 
   run_query(thd, buf, end, TRUE, TRUE);
@@ -3899,6 +3902,9 @@ restart:
               bzero(table->record[0], table->s->null_bytes);
             table->field[0]->store((longlong)::server_id);
             table->field[1]->store((longlong)gci);
+            table->field[2]->store("", 0, &my_charset_bin);
+            table->field[3]->store((longlong)0);
+            table->field[4]->store((longlong)0);
             trans.write_row(::server_id,
                             injector::transaction::table(table, TRUE),
                             &table->s->all_set, table->s->fields,