diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-26 00:34:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-26 00:34:43 +0200 |
| commit | bb8e99fdc367a470c6195a2ae4c33f273fe55a25 (patch) | |
| tree | 3b3bcacec8faab66bf6756f20dff1e45462fdc1c /libmysqld/libmysql.c | |
| parent | add44e684cb9f1b46d1d5facdf6255360fa7b656 (diff) | |
| parent | c02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff) | |
| download | mariadb-git-bb8e99fdc367a470c6195a2ae4c33f273fe55a25.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
Diffstat (limited to 'libmysqld/libmysql.c')
| -rw-r--r-- | libmysqld/libmysql.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index 58900b87147..13dbc78aedd 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2009, 2014, SkySQL Ab. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates + Copyright (c) 2009, 2017, MariaDB Corporation 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 @@ -4919,4 +4919,3 @@ ulong STDCALL mysql_net_field_length(uchar **packet) { return net_field_length(packet); } - |