diff options
| author | unknown <monty@mysql.com> | 2003-12-26 12:32:02 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-26 12:32:02 +0200 |
| commit | 3f4d396dc33a68252f8db838d14192186f4ce342 (patch) | |
| tree | 78482c64b64f7c0b2c63eaa6e676af2c43951f91 /sql/slave.h | |
| parent | 738469384e9f61568aa194e82ddf4e3f2e3d3d37 (diff) | |
| download | mariadb-git-3f4d396dc33a68252f8db838d14192186f4ce342.tar.gz | |
Fixed bug in table level privilege GRANT handling. (Bug #2178)
Portability fixes
mysql-test/r/rpl_until.result:
Portability fix
mysql-test/t/rpl_until.test:
Portability fix
sql/slave.cc:
Write UNTIL position to logs (for debugging)
sql/slave.h:
Write UNTIL position to logs (for debugging)
sql/sql_acl.cc:
Fixed bug in table level privilege GRANT handling. (Bug #2178)
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/slave.h b/sql/slave.h index e42b93a47ef..d92c44dd2ba 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -324,6 +324,11 @@ typedef struct st_relay_log_info /* Check if UNTIL condition is satisfied. See slave.cc for more. */ bool is_until_satisfied(); + inline ulonglong until_pos() + { + return ((until_condition == UNTIL_MASTER_POS) ? group_master_log_pos : + group_relay_log_pos); + } } RELAY_LOG_INFO; |