Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik 2016-05-04 15:23:26 +02:00
commit 87e3e67f43
218 changed files with 3609 additions and 1022 deletions

View file

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