diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-03-09 01:01:20 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-03-09 01:01:20 +0700 |
| commit | 24e6e9b9d035c80ecd2d26f3c35ccd221e6d73ce (patch) | |
| tree | c5d7c3d89ec39dedf986d519fffb8a69746d61d6 /sql/ha_ndbcluster_binlog.cc | |
| parent | 70de99d0fe8d9976b38102eab360e10065907b04 (diff) | |
| parent | 56b937db67f1b48670c8676e66897058d2771601 (diff) | |
| download | mariadb-git-24e6e9b9d035c80ecd2d26f3c35ccd221e6d73ce.tar.gz | |
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/r/rpl_ndb_log.result:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/include/util/OutputStream.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
storage/ndb/tools/restore/Restore.hpp:
manual merge
storage/ndb/tools/restore/restore_main.cpp:
manual merge
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 2615732e7ee..8b51ac68e66 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -729,6 +729,9 @@ static int ndbcluster_create_ndb_apply_status_table(THD *thd) 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); @@ -3898,6 +3901,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, |