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

Merge next-mr -> next-4284.

Browse source
This commit is contained in:
Konstantin Osipov 2010-02-02 12:22:17 +03:00
commit c6c1ddabaf
129 changed files with 3739 additions and 1185 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/rpl_rli.h
View file

@ -322,7 +322,7 @@ public:
void close_temporary_tables();
/* Check if UNTIL condition is satisfied. See slave.cc for more. */
bool is_until_satisfied(my_off_t master_beg_pos);
bool is_until_satisfied(THD *thd, Log_event *ev);
inline ulonglong until_pos()
{
return ((until_condition == UNTIL_MASTER_POS) ? group_master_log_pos :