diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-08 11:40:43 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-08 11:40:43 +0200 |
| commit | 47396ddea91698f6ea1829697566a4d7c31bc789 (patch) | |
| tree | 552acc26b963574a234d2a3bc22b2190e5eabf0e /plugin | |
| parent | c4f3e64c23fe7f7fd18c0a79f87f9771df15fe9f (diff) | |
| parent | 6860a4b55664d8fc53636906240c089417e1849d (diff) | |
| download | mariadb-git-47396ddea91698f6ea1829697566a4d7c31bc789.tar.gz | |
Merge 5.5 into 10.0
Also, implement MDEV-11027 a little differently from 5.5:
recv_sys_t::report(ib_time_t): Determine whether progress should
be reported.
recv_apply_hashed_log_recs(): Rename the parameter to last_batch.
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/server_audit/server_audit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 3b93d3277a6..de0b7bfae8e 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -15,7 +15,7 @@ #define PLUGIN_VERSION 0x104 -#define PLUGIN_STR_VERSION "1.4.0" +#define PLUGIN_STR_VERSION "1.4.1" #define _my_thread_var loc_thread_var |