mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Fix the tree: plugin-related changes, necessary for
CSV storage engine to be statically compiled. Derived from antony's patch. config/ac-macros/storage.m4: don't add objects to the object list if we don't have them configure.in: compile CSV statically sql/ha_myisam.cc: fix prototype to get rid of THD sql/ha_myisam.h: fix prototype to get rid of THD sql/handler.cc: new function for plugins sql/handler.h: fix prototype to get rid of THD declare functions used by plugins sql/item.h: Don't include all the types and files when not building mysqld sql/lock.cc: don's assume that handler knows about THD sql/mysql_priv.h: Don't include all the types and files when not building mysqld declare new plugin functions sql/sql_class.cc: New plugin functions sql/sql_class.h: Don't include all the types and files when not building mysqld sql/sql_lex.h: Don't include all the types and files when not building mysqld storage/csv/Makefile.am: compile CSV into a static lib to be linked into mysqld storage/csv/ha_tina.cc: fix ha_tina to be able to build it static storage/csv/ha_tina.h: fix prototype to get rid of THD
This commit is contained in:
@@ -171,6 +171,7 @@ public:
|
||||
|
||||
class delayed_insert;
|
||||
class select_result;
|
||||
class Time_zone;
|
||||
|
||||
#define THD_SENTRY_MAGIC 0xfeedd1ff
|
||||
#define THD_SENTRY_GONE 0xdeadbeef
|
||||
@@ -344,6 +345,8 @@ typedef struct system_status_var
|
||||
#define last_system_status_var com_stmt_close
|
||||
|
||||
|
||||
#ifdef MYSQL_SERVER
|
||||
|
||||
void free_tmp_table(THD *thd, TABLE *entry);
|
||||
|
||||
|
||||
@@ -354,7 +357,6 @@ void free_tmp_table(THD *thd, TABLE *entry);
|
||||
#define INIT_ARENA_DBUG_INFO
|
||||
#endif
|
||||
|
||||
|
||||
class Query_arena
|
||||
{
|
||||
public:
|
||||
@@ -1905,3 +1907,5 @@ public:
|
||||
/* Functions in sql_class.cc */
|
||||
|
||||
void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var);
|
||||
|
||||
#endif /* MYSQL_SERVER */
|
||||
|
||||
Reference in New Issue
Block a user