diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:47:26 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:54:04 +0300 |
commit | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch) | |
tree | 7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /plugin/auth_ed25519 | |
parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
parent | cb248f880619431850e5638009a6098048050edf (diff) | |
download | mariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'plugin/auth_ed25519')
-rw-r--r-- | plugin/auth_ed25519/client_ed25519.c | 2 | ||||
-rw-r--r-- | plugin/auth_ed25519/common.h | 2 | ||||
-rw-r--r-- | plugin/auth_ed25519/ed25519-t.c | 2 | ||||
-rw-r--r-- | plugin/auth_ed25519/server_ed25519.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/plugin/auth_ed25519/client_ed25519.c b/plugin/auth_ed25519/client_ed25519.c index 16267a156c7..5222da8c7e8 100644 --- a/plugin/auth_ed25519/client_ed25519.c +++ b/plugin/auth_ed25519/client_ed25519.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ /************************** CLIENT *************************************/ diff --git a/plugin/auth_ed25519/common.h b/plugin/auth_ed25519/common.h index 4a52f7742f5..963a8afb421 100644 --- a/plugin/auth_ed25519/common.h +++ b/plugin/auth_ed25519/common.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <mysql.h> #include <string.h> diff --git a/plugin/auth_ed25519/ed25519-t.c b/plugin/auth_ed25519/ed25519-t.c index fa058f69325..4373e59a154 100644 --- a/plugin/auth_ed25519/ed25519-t.c +++ b/plugin/auth_ed25519/ed25519-t.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <tap.h> #include <m_string.h> diff --git a/plugin/auth_ed25519/server_ed25519.c b/plugin/auth_ed25519/server_ed25519.c index 23b4e7389c7..81fc3e66755 100644 --- a/plugin/auth_ed25519/server_ed25519.c +++ b/plugin/auth_ed25519/server_ed25519.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ #include <mysql/plugin_auth.h> #include "common.h" |