database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

bzr merge -rtag:mariadb-10.0.15 maria/10.0

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-12-05 12:33:02 -05:00
parent a4cdd20d49 ffc0ef6316
commit 3bb02f3e6d
2330 changed files with 593281 additions and 12514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_prepare.cc
View File

@ -84,7 +84,7 @@ When one supplies long data for a placeholder:
at statement execute.
*/
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include <my_global.h> /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_priv.h"
#include "unireg.h"
#include "sql_class.h" // set_var.h: THD