database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge remote-tracking branch 'origin/5.5' into 10.0

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-07-25 00:41:54 +03:00
parent 2ce3f95151 c8a0244e95
commit 786ad0a158
70 changed files with 820 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/net_serv.cc
View File

@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
Copyright (c) 2012, 2016, MariaDB
Copyright (c) 2012, 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