diff options
| author | unknown <tomas@poseidon.> | 2006-12-20 15:34:45 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.> | 2006-12-20 15:34:45 +0100 |
| commit | 67d7141ad3881db8e2e369212dfea91b564ee11b (patch) | |
| tree | e8b2c03e693a149c85e410490ca450e5cfed62d7 | |
| parent | 93e6d00d3bee14a37971f7be8b8835dbca3ab2cb (diff) | |
| download | mariadb-git-67d7141ad3881db8e2e369212dfea91b564ee11b.tar.gz | |
Bug #21806: wrong ndb binlog behaviour when cluster disconnects/restarts
- latest gci is reinitialized to 0 at reconnect, ndb binlog thread needs to wait until valid gci is retrieved
| -rw-r--r-- | mysql-test/r/ndb_binlog_discover.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 4 | ||||
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/ndb_binlog_discover.result b/mysql-test/r/ndb_binlog_discover.result index e81d5cfc6f3..4806047a016 100644 --- a/mysql-test/r/ndb_binlog_discover.result +++ b/mysql-test/r/ndb_binlog_discover.result @@ -5,7 +5,7 @@ show binlog events from <binlog_start>; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) -master-bin.000001 # Table_map # # table_id: # (mysql.apply_status) +master-bin.000001 # Table_map # # table_id: # (mysql.ndb_apply_status) master-bin.000001 # Write_rows # # table_id: # master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 179ccef475d..b514eaf654f 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -32,8 +32,8 @@ synchronization : Bug#24529 Test 'synchronization' fails on Mac pushb # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open #ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events -ndb_binlog_discover : bug#21806 2006-08-24 -ndb_autodiscover3 : bug#21806 +#ndb_binlog_discover : bug#21806 2006-08-24 +#ndb_autodiscover3 : bug#21806 flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 7e966497ed0..5598f6c9649 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -3542,7 +3542,7 @@ restart: if (abort_loop) goto err; schema_res= s_ndb->pollEvents(100, &schema_gci); - } while (ndb_latest_received_binlog_epoch == schema_gci); + } while (schema_gci == 0 || ndb_latest_received_binlog_epoch == schema_gci); if (ndb_binlog_running) { Uint64 gci= i_ndb->getLatestGCI(); |