diff options
| author | unknown <mats@capulet.net> | 2007-04-13 19:19:10 +0200 |
|---|---|---|
| committer | unknown <mats@capulet.net> | 2007-04-13 19:19:10 +0200 |
| commit | a8bcc697ce536fe3d000ef25bd1748dbef09479b (patch) | |
| tree | dfcfc23c624a6dc46a2d25f6752bd6e105361fdc /sql/rpl_rli.h | |
| parent | 461608cc6067dbdeadf9c05ee27e42586c71b11d (diff) | |
| download | mariadb-git-a8bcc697ce536fe3d000ef25bd1748dbef09479b.tar.gz | |
Fixes to make it compile when using Sun CC and restoring some changes
done in previous patches.
There is an error in the Sun CC compiler that treats parameters that
differ in only qualifier as different, even though this is not
allowed by the standard (ISO/IEC 14882:2003, Section 13.1).
sql/log_event.cc:
Removing const qualifier since it causes linker error.
sql/log_event.h:
Restoring time_t instead of my_time_t since it causes warnings
elsewhere. Renaming parameters to functions since they hide
member variable (which causes warnings on Sun CC).
sql/rpl_record.cc:
Removing const qualifier since it causes linker error.
sql/rpl_rli.cc:
Restoring time_t instead of my_time_t since it causes warnings
elsewhere. Removing const qualifier since it causes linker error.
sql/rpl_rli.h:
Restoring time_t instead of my_time_t since it causes warnings
elsewhere. Removing const qualifier since it causes linker error.
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 7727c35ae53..fada45722f6 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -184,7 +184,7 @@ typedef struct st_relay_log_info ulonglong future_group_master_log_pos; #endif - my_time_t last_master_timestamp; + time_t last_master_timestamp; void clear_slave_error(); void clear_until_condition(); @@ -345,7 +345,7 @@ typedef struct st_relay_log_info the <code>Seconds_behind_master</code> field. */ void stmt_done(my_off_t event_log_pos, - my_time_t event_creation_time); + time_t event_creation_time); /** |