WL#5030: Split and remove mysql_priv.h

This patch:

- Moves all definitions from the mysql_priv.h file into
  header files for the component where the variable is
  defined
- Creates header files if the component lacks one
- Eliminates all include directives from mysql_priv.h
- Eliminates all circular include cycles
- Rename time.cc to sql_time.cc
- Rename mysql_priv.h to sql_priv.h

4 files changed, 10 insertions, 2 deletions

diff --git a/plugin/daemon_example/daemon_example.cc b/plugin/daemon_example/daemon_example.cc
index af585bb4302..2a41179974d 100644
--- a/plugin/daemon_example/daemon_example.cc
+++ b/plugin/daemon_example/daemon_example.cc
@@ -13,13 +13,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
-#include <mysql_priv.h>
+#include <sql_priv.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <mysql_version.h>
 #include <mysql/plugin.h>
 #include <my_global.h>
 #include <my_dir.h>
+#include "my_pthread.h"                         // pthread_handler_t
+#include "my_sys.h"                             // my_write, my_malloc
+#include "m_string.h"                           // strlen
+#include "sql_plugin.h"                         // st_plugin_int
 
 /*
   Disable __attribute__() on non-gcc compilers.
diff --git a/plugin/semisync/semisync.h b/plugin/semisync/semisync.h
index ced25c40534..57353f3c156 100644
--- a/plugin/semisync/semisync.h
+++ b/plugin/semisync/semisync.h
@@ -20,11 +20,13 @@
 
 #define MYSQL_SERVER
 #define HAVE_REPLICATION
-#include <mysql_priv.h>
+#include <sql_priv.h>
+#include "unireg.h"
 #include <my_global.h>
 #include <my_pthread.h>
 #include <mysql/plugin.h>
 #include <replication.h>
+#include "log.h"                                /* sql_print_information */
 
 typedef struct st_mysql_show_var SHOW_VAR;
 typedef struct st_mysql_sys_var SYS_VAR;
diff --git a/plugin/semisync/semisync_master_plugin.cc b/plugin/semisync/semisync_master_plugin.cc
index e371df3edc3..d6cc23a43b7 100644
--- a/plugin/semisync/semisync_master_plugin.cc
+++ b/plugin/semisync/semisync_master_plugin.cc
@@ -16,6 +16,7 @@
 
 
 #include "semisync_master.h"
+#include "sql_class.h"                          // THD
 
 ReplSemiSyncMaster repl_semisync;
 
diff --git a/plugin/semisync/semisync_slave_plugin.cc b/plugin/semisync/semisync_slave_plugin.cc
index 0bd9e1b8b21..66073f8a5e6 100644
--- a/plugin/semisync/semisync_slave_plugin.cc
+++ b/plugin/semisync/semisync_slave_plugin.cc
@@ -16,6 +16,7 @@
 
 
 #include "semisync_slave.h"
+#include <mysql.h>
 
 ReplSemiSyncSlave repl_semisync;