database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge remote-tracking branch 'mysql/5.5' into 5.5

Browse Source
This commit is contained in:
Sergei Golubchik
2017-07-18 14:59:10 +02:00
parent e7fd6ed387 34cd74e521
commit 9a5fe1f4ea
35 changed files with 530 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libmysql/libmysql.c
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2014, Oracle and/or its affiliates
Copyright (c) 2009, 2014, Monty Program Ab
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
@ -4913,4 +4913,3 @@ ulong STDCALL mysql_net_field_length(uchar **packet)
{
return net_field_length(packet);
}