diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 15:08:56 +0100 |
| commit | 704b4845aa9ce51a6c5a9f5f42265e376db0dfb3 (patch) | |
| tree | 73476f970c229f75846855edeeddfbc6fd87ed4b /sql/rpl_constants.h | |
| parent | 2637dda66845868fe996e60e54996acf03f6c537 (diff) | |
| parent | a5e5b0180a6b86cce258eef232ef59d6e7c40bb0 (diff) | |
| download | mariadb-git-704b4845aa9ce51a6c5a9f5f42265e376db0dfb3.tar.gz | |
merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.
mysys/thr_mutex.c:
adding DBUG_PRINT here, so that we can locate where the warning is issued.
Diffstat (limited to 'sql/rpl_constants.h')
| -rw-r--r-- | sql/rpl_constants.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_constants.h b/sql/rpl_constants.h index 426e80a328d..32fb4b8a7f2 100644 --- a/sql/rpl_constants.h +++ b/sql/rpl_constants.h @@ -6,10 +6,10 @@ */ enum Incident { /** No incident */ - INCIDENT_NONE, + INCIDENT_NONE = 0, /** There are possibly lost events in the replication stream */ - INCIDENT_LOST_EVENTS, + INCIDENT_LOST_EVENTS = 1, /** Shall be last event of the enumeration */ INCIDENT_COUNT |