diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-25 00:41:54 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-25 00:41:54 +0300 |
| commit | 786ad0a158f92eae0d65b02f34e864a7bbd8390e (patch) | |
| tree | 8b796ce3ce81ab3c1f73e6eb5c594c74619810c0 /libmysql | |
| parent | 2ce3f95151a424f950be40140c45b0ba583e07ab (diff) | |
| parent | c8a0244e957bc4beff453f09c881bb51752d682c (diff) | |
| download | mariadb-git-786ad0a158f92eae0d65b02f34e864a7bbd8390e.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index c07fad38802..4db60313775 100644 --- a/libmysql/libmysql.c +++ b/libmysql/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 @@ -4927,4 +4927,3 @@ ulong STDCALL mysql_net_field_length(uchar **packet) { return net_field_length(packet); } - |