diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-09 11:27:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-09 11:27:40 +0100 |
| commit | f3444df4153ccbb9ea8db73c1b5de6d7aa6d1334 (patch) | |
| tree | 76c059c29ec0caca19a62dbcbe8efcd22e697692 /plugin | |
| parent | c4cb24006139bb6a619ca9d6b00d00c2275d2c28 (diff) | |
| parent | 93a6142dd0c0c8b2e0683e4d57082582eac91fdb (diff) | |
| download | mariadb-git-f3444df4153ccbb9ea8db73c1b5de6d7aa6d1334.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
reverted about half of commits as either not applicable or
outright wrong
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 |