Merge branch '10.1' into 10.2

This commit is contained in:
Sergei Golubchik 2017-03-30 12:48:42 +02:00
commit da4d71d10d
1708 changed files with 29498 additions and 15585 deletions

View file

@ -11,7 +11,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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
#ifndef MYSQL_SERVER
#define MYSQL_SERVER