mirror of
https://github.com/MariaDB/server.git
synced 2026-04-27 10:45:30 +02: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:
parent
7dbb63fe20
commit
bd7120f97c
15 changed files with 103 additions and 34 deletions
|
|
@ -29,6 +29,7 @@ class st_alter_tablespace;
|
|||
class partition_info;
|
||||
class event_timed;
|
||||
|
||||
#ifdef MYSQL_SERVER
|
||||
/*
|
||||
The following hack is needed because mysql_yacc.cc does not define
|
||||
YYSTYPE before including this file
|
||||
|
|
@ -43,6 +44,7 @@ class event_timed;
|
|||
#include "sql_yacc.h"
|
||||
#define LEX_YYSTYPE YYSTYPE *
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
When a command is added here, be sure it's also added in mysqld.cc
|
||||
|
|
@ -115,6 +117,8 @@ enum enum_sql_command {
|
|||
*/
|
||||
#define DESCRIBE_PARTITIONS 4
|
||||
|
||||
#ifdef MYSQL_SERVER
|
||||
|
||||
enum enum_sp_suid_behaviour
|
||||
{
|
||||
SP_IS_DEFAULT_SUID= 0,
|
||||
|
|
@ -1109,3 +1113,5 @@ extern int yylex(void *arg, void *yythd);
|
|||
extern pthread_key(LEX*,THR_LEX);
|
||||
|
||||
#define current_lex (current_thd->lex)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue