diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
commit | d11829654c4ef5c3d0f997ca61a50d4bd196db8a (patch) | |
tree | e48a5775e961b17600bf9c1c189243deb5515ba7 /sql/rpl_utility.h | |
parent | e022b6ef07529d83e8c1cbd5e3d374fc5cc75721 (diff) | |
parent | 704898bf3200af4da42c1bf9251a7da5533db73f (diff) | |
download | mariadb-git-d11829654c4ef5c3d0f997ca61a50d4bd196db8a.tar.gz |
merge with MySQL 5.5.27
manually checked every change, reverted incorrect or stupid changes.
Diffstat (limited to 'sql/rpl_utility.h')
-rw-r--r-- | sql/rpl_utility.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h index 9046891e27f..79f4517c492 100644 --- a/sql/rpl_utility.h +++ b/sql/rpl_utility.h @@ -272,7 +272,7 @@ private: public: Deferred_log_events(Relay_log_info *rli); ~Deferred_log_events(); - /* queue for exection at Query-log-event time prior the Query */; + /* queue for exection at Query-log-event time prior the Query */ int add(Log_event *ev); bool is_empty(); bool execute(Relay_log_info *rli); |