Merge branch '5.5' into 10.0

This commit is contained in:
Sergei Golubchik 2016-04-26 23:05:26 +02:00
commit 872649c7ba
109 changed files with 1309 additions and 319 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