summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-06-28 09:03:13 +0200
committerSergei Golubchik <serg@mariadb.org>2015-06-28 12:09:46 +0200
commit26162c71c5c2532ab08020146d4e6c32fb06a8e8 (patch)
treea657d0eed72e53463b4c69460527b2b41fc01612
parent55b96d27089ee809dd0a4c9b3e0e3adb5a731bd4 (diff)
downloadmariadb-git-26162c71c5c2532ab08020146d4e6c32fb06a8e8.tar.gz
rename {sys_vars,sql_plugin_services}.h -> *.ic
-rw-r--r--libservices/HOWTO2
-rw-r--r--sql/CMakeLists.txt2
-rw-r--r--sql/sql_plugin.cc2
-rw-r--r--sql/sql_plugin_services.ic (renamed from sql/sql_plugin_services.h)0
-rw-r--r--sql/sys_vars.cc2
-rw-r--r--sql/sys_vars.ic (renamed from sql/sys_vars.h)0
6 files changed, 4 insertions, 4 deletions
diff --git a/libservices/HOWTO b/libservices/HOWTO
index 9f1fc2dba2b..69d96f8aa25 100644
--- a/libservices/HOWTO
+++ b/libservices/HOWTO
@@ -84,7 +84,7 @@ it should also declare all the accompanying data structures, as necessary
7. add the new file to libservices/CMakeLists.txt (MYSQLSERVICES_SOURCES)
8. Add all new files to repository (bzr add)
9. and finally, register your service for dynamic linking in
- sql/sql_plugin_services.h as follows:
+ sql/sql_plugin_services.ic as follows:
9.1 fill in the service structure:
==================================================================
static struct foo_service_st foo_handler = {
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 2eb65837992..169f260a91b 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -82,7 +82,7 @@ SET (SQL_SOURCE
filesort_utils.cc
filesort.cc gstream.cc sha2.cc
signal_handler.cc
- handler.cc hash_filo.h sql_plugin_services.h
+ handler.cc hash_filo.h
hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc
item_create.cc item_func.cc item_geofunc.cc item_row.cc
item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index e9547d805e2..595c371f515 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -215,7 +215,7 @@ static struct
/* support for Services */
-#include "sql_plugin_services.h"
+#include "sql_plugin_services.ic"
/*
A mutex LOCK_plugin must be acquired before accessing the
diff --git a/sql/sql_plugin_services.h b/sql/sql_plugin_services.ic
index 4bb1861281e..4bb1861281e 100644
--- a/sql/sql_plugin_services.h
+++ b/sql/sql_plugin_services.ic
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 3a197de6bd2..889a88db98b 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -34,7 +34,7 @@
#include "sql_plugin.h" // Includes my_global.h
#include "sql_priv.h"
#include "sql_class.h" // set_var.h: THD
-#include "sys_vars.h"
+#include "sys_vars.ic"
#include "events.h"
#include <thr_alarm.h>
diff --git a/sql/sys_vars.h b/sql/sys_vars.ic
index 7c0359a7427..7c0359a7427 100644
--- a/sql/sys_vars.h
+++ b/sql/sys_vars.ic