diff options
author | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
---|---|---|
committer | Mats Kindahl <mats@sun.com> | 2010-03-31 16:05:33 +0200 |
commit | 23d8586dbfdfdf02fa2f801b9dad91db53025a64 (patch) | |
tree | 19f32879e77ada23d733f35173a25f410d655ebe /storage/example | |
parent | d7dd2fc92f042596c2e72a96934bb207270e7419 (diff) | |
download | mariadb-git-23d8586dbfdfdf02fa2f801b9dad91db53025a64.tar.gz |
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
Diffstat (limited to 'storage/example')
-rw-r--r-- | storage/example/ha_example.cc | 6 | ||||
-rw-r--r-- | storage/example/ha_example.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index fb143f0b8d4..2fbb17e46bd 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -91,11 +91,11 @@ #pragma implementation // gcc: Class implementation #endif -#define MYSQL_SERVER 1 -#include "mysql_priv.h" +#include "sql_priv.h" +#include "sql_class.h" // MYSQL_HANDLERTON_INTERFACE_VERSION #include "ha_example.h" #include "probes_mysql.h" -#include <mysql/plugin.h> +#include "sql_plugin.h" static handler *example_create_handler(handlerton *hton, TABLE_SHARE *table, diff --git a/storage/example/ha_example.h b/storage/example/ha_example.h index 0c04249b6eb..12e088f5f05 100644 --- a/storage/example/ha_example.h +++ b/storage/example/ha_example.h @@ -35,6 +35,11 @@ #pragma interface /* gcc class implementation */ #endif +#include "my_global.h" /* ulonglong */ +#include "thr_lock.h" /* THR_LOCK, THR_LOCK_DATA */ +#include "handler.h" /* handler */ +#include "my_base.h" /* ha_rows */ + /** @brief EXAMPLE_SHARE is a structure that will be shared among all open handlers. This example implements the minimum of what you will probably need. |