diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 17:48:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 17:48:36 +0100 |
| commit | 7f19330c595e3183d079fe2c18eecc74740e8f83 (patch) | |
| tree | 8b853976cd14d96d5415757be525133b32be0c93 /sql/wsrep_mysqld.h | |
| parent | 4046ed12bcddfd831c510b022cb7af224be9457b (diff) | |
| parent | f4421c893b50f05078f14d33c47d21f52f59f8a7 (diff) | |
| download | mariadb-git-7f19330c595e3183d079fe2c18eecc74740e8f83.tar.gz | |
Merge branch 'github/10.0-galera' into 10.1
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 24af4ec0953..3c36e88eb6d 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -289,7 +289,8 @@ int wsrep_alter_event_query(THD *thd, uchar** buf, size_t* buf_len); extern bool wsrep_grant_mdl_exception(MDL_context *requestor_ctx, - MDL_ticket *ticket); + MDL_ticket *ticket, + const MDL_key *key); IO_CACHE * get_trans_log(THD * thd); bool wsrep_trans_cache_is_empty(THD *thd); void thd_binlog_flush_pending_rows_event(THD *thd, bool stmt_end); |