summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2014-12-05 12:33:02 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2014-12-05 12:33:02 -0500
commit3bb02f3e6d70687b02c6902fd6478e8c328608f8 (patch)
tree7962068cae78450246a484cf95cbe5cf2e37382a /sql/sql_plugin.cc
parenta4cdd20d49a5a6ca0eb7346b7b9e898ac5e7995b (diff)
parentffc0ef63164e9a121d8a02323afe32a82299171e (diff)
downloadmariadb-git-3bb02f3e6d70687b02c6902fd6478e8c328608f8.tar.gz
bzr merge -rtag:mariadb-10.0.15 maria/10.0
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index fb9bb05bcb4..34ad2ff2615 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -15,7 +15,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 "sql_plugin.h"
+#include "sql_plugin.h" // Includes my_global.h
#include "sql_priv.h" // SHOW_MY_BOOL
#include "unireg.h"
#include "sql_class.h" // set_var.h: THD