1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

bzr merge -rtag:mariadb-10.0.15 maria/10.0

This commit is contained in:
Nirbhay Choubey
2014-12-05 12:33:02 -05:00
2330 changed files with 593281 additions and 12514 deletions

View File

@@ -13,6 +13,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <my_global.h>
#include "sql_reload.h"
#include "sql_priv.h"
#include "mysqld.h" // select_errors