diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:18:46 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-14 17:18:46 +0300 |
commit | be85d3e61bb4217453a6879cb28d9bd369ad17dd (patch) | |
tree | c1ec0aab43cf0df71d88b8278367a79aabc43f52 /vio/viosocket.c | |
parent | c0bc9480e73242b075178cb5da5713ba9d84be7c (diff) | |
parent | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (diff) | |
download | mariadb-git-be85d3e61bb4217453a6879cb28d9bd369ad17dd.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'vio/viosocket.c')
-rw-r--r-- | vio/viosocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index d34bb13b1bd..d9e2b0451b4 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -15,7 +15,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 St, Fifth Floor, Boston, MA - 02110-1301 USA */ + 02110-1335 USA */ /* Note that we can't have assertion on file descriptors; The reason for |