diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-09 14:08:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-09 14:08:36 +0100 |
| commit | 01628ce35a241c2bd1a3c2954ee09b6dda961a74 (patch) | |
| tree | e1c5297396d7bf9a5f6547e8393caa8abc8355dc /plugin | |
| parent | ea0c3fc87b6964db63f328b1567a06f21042c5d1 (diff) | |
| parent | afce5415de6e1230e3ebca60b0584f36fb04fecc (diff) | |
| download | mariadb-git-01628ce35a241c2bd1a3c2954ee09b6dda961a74.tar.gz | |
Merge branch 'bb-5.5-serg' into 5.5
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/semisync/semisync_master.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc index 625f7448945..3c22bcb94f2 100644 --- a/plugin/semisync/semisync_master.cc +++ b/plugin/semisync/semisync_master.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2007 Google Inc. - Copyright (c) 2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. - Use is subject to license terms. + Copyright (c) 2008, 2013, Oracle and/or its affiliates. + Copyright (c) 2011, 2016, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |