mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 14:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

5.3->5.5 merge

Browse source
This commit is contained in:
Sergei Golubchik 2011-11-22 18:04:38 +01:00
commit d2755a2c9c
394 changed files with 17627 additions and 3353 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/rpl_rli.h
View file

@ -455,14 +455,14 @@ public:
/**
Save pointer to Annotate_rows event and switch on the
binlog_annotate_rows_events for this sql thread.
binlog_annotate_row_events for this sql thread.
To be called when sql thread recieves an Annotate_rows event.
*/
inline void set_annotate_event(Annotate_rows_log_event *event)
{
free_annotate_event();
m_annotate_event= event;
sql_thd->variables.binlog_annotate_rows_events= 1;
sql_thd->variables.binlog_annotate_row_events= 1;
}
/**
@ -476,7 +476,7 @@ public:
/**
Delete saved Annotate_rows event (if any) and switch off the
binlog_annotate_rows_events for this sql thread.
binlog_annotate_row_events for this sql thread.
To be called when sql thread has applied the last (i.e. with
STMT_END_F flag) rbr event.
*/
@ -484,7 +484,7 @@ public:
{
if (m_annotate_event)
{
sql_thd->variables.binlog_annotate_rows_events= 0;
sql_thd->variables.binlog_annotate_row_events= 0;
delete m_annotate_event;
m_annotate_event= 0;
}