diff options
| author | Daniel Fischer <daniel.fischer@oracle.com> | 2011-09-21 12:40:41 +0200 |
|---|---|---|
| committer | Daniel Fischer <daniel.fischer@oracle.com> | 2011-09-21 12:40:41 +0200 |
| commit | 7450044eb77157275241d40623865e102b577977 (patch) | |
| tree | b2ce22644a29502769b8202db0ab2e8f3b5ecea6 /plugin/semisync | |
| parent | d27d267ee73e9d307e80d4bf91aefcf746b502f7 (diff) | |
| parent | 8433c8ce61956fdeea45a55c7262bf509aaefb0d (diff) | |
| download | mariadb-git-7450044eb77157275241d40623865e102b577977.tar.gz | |
merge from 5.5.16
Diffstat (limited to 'plugin/semisync')
| -rw-r--r-- | plugin/semisync/semisync_master_plugin.cc | 3 | ||||
| -rw-r--r-- | plugin/semisync/semisync_slave_plugin.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugin/semisync/semisync_master_plugin.cc b/plugin/semisync/semisync_master_plugin.cc index ea87adf98c4..9a325018242 100644 --- a/plugin/semisync/semisync_master_plugin.cc +++ b/plugin/semisync/semisync_master_plugin.cc @@ -429,6 +429,7 @@ mysql_declare_plugin(semi_sync_master) 0x0100 /* 1.0 */, semi_sync_master_status_vars, /* status variables */ semi_sync_master_system_vars, /* system variables */ - NULL /* config options */ + NULL, /* config options */ + 0, /* flags */ } mysql_declare_plugin_end; diff --git a/plugin/semisync/semisync_slave_plugin.cc b/plugin/semisync/semisync_slave_plugin.cc index cfb04bdd276..d5472b9cc83 100644 --- a/plugin/semisync/semisync_slave_plugin.cc +++ b/plugin/semisync/semisync_slave_plugin.cc @@ -225,6 +225,7 @@ mysql_declare_plugin(semi_sync_slave) 0x0100 /* 1.0 */, semi_sync_slave_status_vars, /* status variables */ semi_sync_slave_system_vars, /* system variables */ - NULL /* config options */ + NULL, /* config options */ + 0, /* flags */ } mysql_declare_plugin_end; |