summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.cc
diff options
context:
space:
mode:
authorunknown <mats@capulet.net>2007-04-13 19:19:10 +0200
committerunknown <mats@capulet.net>2007-04-13 19:19:10 +0200
commita8bcc697ce536fe3d000ef25bd1748dbef09479b (patch)
treedfcfc23c624a6dc46a2d25f6752bd6e105361fdc /sql/rpl_rli.cc
parent461608cc6067dbdeadf9c05ee27e42586c71b11d (diff)
downloadmariadb-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.cc')
-rw-r--r--sql/rpl_rli.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index 57de3bc6838..702dec72f56 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -1087,8 +1087,8 @@ bool st_relay_log_info::cached_charset_compare(char *charset) const
}
-void st_relay_log_info::stmt_done(my_off_t const event_master_log_pos,
- my_time_t event_creation_time)
+void st_relay_log_info::stmt_done(my_off_t event_master_log_pos,
+ time_t event_creation_time)
{
clear_flag(IN_STMT);