mirror of
https://github.com/MariaDB/server.git
synced 2025-11-02 02:53:04 +03:00
Don't use static link by default (in compile-pentium) as some new systems doesn't have all static libraries available Change type for functions in plugin.h:str_mysql_ftparser_param() to const unsigned char and string lengths to size_t. One effect of the above change is that one needs to include mysql_global.h or define size_t before including plugin.h This fixes a case where mysql_client_test failed with newer gcc that enables strict-aliasing by default BUILD/compile-pentium: Don't use static link by default as some new systems doesn't have all static libraries available client/mysql_upgrade.c: Remove not used variable cmd-line-utils/readline/config_readline.h: Define some constants to get rid of compiler warnings on Linux cmd-line-utils/readline/display.c: Get rid of compiler warnings cmd-line-utils/readline/history.c: Got rid of compiler warnings: - Defining some strings as const - Added cast cmd-line-utils/readline/rlmbutil.h: Added cast to get rid of compiler warnings cmd-line-utils/readline/text.c: Remove not needed initialization to get rid of compiler warnings cmd-line-utils/readline/xmalloc.c: Changed types to 'const char* to get rid of compiler warnings configure.in: Ensure that we use MariaDB as suffix include/mysql/plugin.h: Changed types to 'const unsigned char* to get rid of compiler warnings (in other parts of the code) Change length for not \0 terminated string to size_t include/mysql/plugin.h.pp: Update related to plugin.h libmysql/libmysql.c: Fixed bug that caused core dump with newer gcc when strict aliasing is not turned off mysql-test/t/information_schema.test: Test is depending on innodb mysql-test/t/not_partition.test: Fixed wrong directory name (Not noticed before as we don't ususally run this test) mysys/lf_hash.c: Got rid of compiler warnings from -Wstrict-aliasing mysys/my_redel.c: Removed not used variable regex/engine.c: Changed types to 'const char* to get rid of compiler warnings regex/engine.ih: Changed types to 'const char* to get rid of compiler warnings sql/sp_head.cc: Got rid of compiler warning from -Wstrict-aliasing sql/sql_base.cc: Got rid of compiler warnings from -Wstrict-aliasing (The original code was probably wrong as nj_col->table_field was sql/sql_builtin.cc.in: plugin.h needs to have size_t defined sql/sql_parse.cc: Remove used variable sql/sql_select.cc: Got rid of compiler warnings from -Wstrict-aliasing sql/sql_show.cc: Added #ifdef to get rid of compiler warning when not using partition engine sql/table.cc: Got rid of compiler warning from -Wstrict-aliasing storage/maria/ha_maria.cc: Got rid of compiler warnings from -Wstrict-aliasing: - Use the thd_killed() API function storage/maria/lockman.c: Got rid of compiler warnings from -Wstrict-aliasing storage/maria/ma_check.c: Got rid of compiler warnings from -Wstrict-aliasing Change to use new version of _ma_killed_ptr; Don't call it as often as before storage/maria/ma_check_standalone.h: Update to compatible _ma_killed_ptr() from ha_maria.cc storage/maria/ma_ft_boolean_search.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/maria/ma_ft_nlq_search.c: Got rid of compiler warnings from -Wstrict-aliasing Ensure that 'subkeys' is 32 bit storage/maria/ma_ft_parser.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/maria/ma_ftdefs.h: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/maria/ma_sort.c: Change to use new version of _ma_killed_ptr; Don't call it as often as before storage/maria/ma_state.c: Got rid of compiler warnings from -Wstrict-aliasing storage/maria/maria_def.h: Redefine ma_killed_ptr() storage/maria/maria_ftdump.c: Got rid of compiler warnings from -Wstrict-aliasing storage/maria/trnman.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/ft_boolean_search.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ft_nlq_search.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/ft_parser.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ft_stopwords.c: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ftdefs.h: Changed pointers from char -> const char* and length to size_t (to get rid of compiler warnings and casts) storage/myisam/ha_myisam.cc: Got rid of compiler warnings from -Wstrict-aliasing: - Use the thd_killed() API function storage/myisam/mi_check.c: Use new killed_ptr() function storage/myisam/myisam_ftdump.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/myisamchk.c: Update to compatible killed_ptr() from ha_myisam.cc storage/myisam/myisamdef.h: Redefine killed_ptr() storage/myisam/myisamlog.c: Got rid of compiler warnings from -Wstrict-aliasing storage/myisam/sort.c: Change to use new version of killed_ptr; Don't call it as often as before storage/xtradb/fil/fil0fil.c: Fixedc ompiler warning storage/xtradb/trx/trx0i_s.c: Include mysql_plugin.h later to ensure that size_t is defined
141 lines
4.3 KiB
ObjectPascal
141 lines
4.3 KiB
ObjectPascal
struct st_mysql_lex_string
|
|
{
|
|
char *str;
|
|
unsigned int length;
|
|
};
|
|
typedef struct st_mysql_lex_string MYSQL_LEX_STRING;
|
|
struct st_mysql_xid {
|
|
long formatID;
|
|
long gtrid_length;
|
|
long bqual_length;
|
|
char data[128];
|
|
};
|
|
typedef struct st_mysql_xid MYSQL_XID;
|
|
enum enum_mysql_show_type
|
|
{
|
|
SHOW_UNDEF, SHOW_BOOL, SHOW_INT, SHOW_LONG,
|
|
SHOW_LONGLONG, SHOW_CHAR, SHOW_CHAR_PTR,
|
|
SHOW_ARRAY, SHOW_FUNC, SHOW_DOUBLE
|
|
};
|
|
struct st_mysql_show_var {
|
|
const char *name;
|
|
char *value;
|
|
enum enum_mysql_show_type type;
|
|
};
|
|
typedef int (*mysql_show_var_func)(void*, struct st_mysql_show_var*, char *);
|
|
struct st_mysql_sys_var;
|
|
struct st_mysql_value;
|
|
typedef int (*mysql_var_check_func)(void* thd,
|
|
struct st_mysql_sys_var *var,
|
|
void *save, struct st_mysql_value *value);
|
|
typedef void (*mysql_var_update_func)(void* thd,
|
|
struct st_mysql_sys_var *var,
|
|
void *var_ptr, const void *save);
|
|
struct st_mysql_plugin
|
|
{
|
|
int type;
|
|
void *info;
|
|
const char *name;
|
|
const char *author;
|
|
const char *descr;
|
|
int license;
|
|
int (*init)(void *);
|
|
int (*deinit)(void *);
|
|
unsigned int version;
|
|
struct st_mysql_show_var *status_vars;
|
|
struct st_mysql_sys_var **system_vars;
|
|
void * __reserved1;
|
|
};
|
|
enum enum_ftparser_mode
|
|
{
|
|
MYSQL_FTPARSER_SIMPLE_MODE= 0,
|
|
MYSQL_FTPARSER_WITH_STOPWORDS= 1,
|
|
MYSQL_FTPARSER_FULL_BOOLEAN_INFO= 2
|
|
};
|
|
enum enum_ft_token_type
|
|
{
|
|
FT_TOKEN_EOF= 0,
|
|
FT_TOKEN_WORD= 1,
|
|
FT_TOKEN_LEFT_PAREN= 2,
|
|
FT_TOKEN_RIGHT_PAREN= 3,
|
|
FT_TOKEN_STOPWORD= 4
|
|
};
|
|
typedef struct st_mysql_ftparser_boolean_info
|
|
{
|
|
enum enum_ft_token_type type;
|
|
int yesno;
|
|
int weight_adjust;
|
|
char wasign;
|
|
char trunc;
|
|
char prev;
|
|
char *quot;
|
|
} MYSQL_FTPARSER_BOOLEAN_INFO;
|
|
typedef struct st_mysql_ftparser_param
|
|
{
|
|
int (*mysql_parse)(struct st_mysql_ftparser_param *,
|
|
const unsigned char *doc, size_t doc_len);
|
|
int (*mysql_add_word)(struct st_mysql_ftparser_param *,
|
|
const unsigned char *word, size_t word_len,
|
|
MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info);
|
|
void *ftparser_state;
|
|
void *mysql_ftparam;
|
|
struct charset_info_st *cs;
|
|
char *doc;
|
|
int length;
|
|
int flags;
|
|
enum enum_ftparser_mode mode;
|
|
} MYSQL_FTPARSER_PARAM;
|
|
struct st_mysql_ftparser
|
|
{
|
|
int interface_version;
|
|
int (*parse)(MYSQL_FTPARSER_PARAM *param);
|
|
int (*init)(MYSQL_FTPARSER_PARAM *param);
|
|
int (*deinit)(MYSQL_FTPARSER_PARAM *param);
|
|
};
|
|
struct st_mysql_storage_engine
|
|
{
|
|
int interface_version;
|
|
};
|
|
struct handlerton;
|
|
struct st_mysql_daemon
|
|
{
|
|
int interface_version;
|
|
};
|
|
struct st_mysql_information_schema
|
|
{
|
|
int interface_version;
|
|
};
|
|
struct st_mysql_value
|
|
{
|
|
int (*value_type)(struct st_mysql_value *);
|
|
const char *(*val_str)(struct st_mysql_value *, char *buffer, int *length);
|
|
int (*val_real)(struct st_mysql_value *, double *realbuf);
|
|
int (*val_int)(struct st_mysql_value *, long long *intbuf);
|
|
};
|
|
int thd_in_lock_tables(const void* thd);
|
|
int thd_tablespace_op(const void* thd);
|
|
long long thd_test_options(const void* thd, long long test_options);
|
|
int thd_sql_command(const void* thd);
|
|
void **thd_ha_data(const void* thd, const struct handlerton *hton);
|
|
int thd_tx_isolation(const void* thd);
|
|
char *thd_security_context(void* thd, char *buffer, unsigned int length,
|
|
unsigned int max_query_len);
|
|
void thd_inc_row_count(void* thd);
|
|
const char *set_thd_proc_info(void*, const char * info, const char *func,
|
|
const char *file, const unsigned int line);
|
|
int mysql_tmpfile(const char *prefix);
|
|
int thd_killed(const void* thd);
|
|
unsigned long thd_get_thread_id(const void* thd);
|
|
void *thd_alloc(void* thd, unsigned int size);
|
|
void *thd_calloc(void* thd, unsigned int size);
|
|
char *thd_strdup(void* thd, const char *str);
|
|
char *thd_strmake(void* thd, const char *str, unsigned int size);
|
|
void *thd_memdup(void* thd, const void* str, unsigned int size);
|
|
MYSQL_LEX_STRING *thd_make_lex_string(void* thd, MYSQL_LEX_STRING *lex_str,
|
|
const char *str, unsigned int size,
|
|
int allocate_lex_string);
|
|
void thd_get_xid(const void* thd, MYSQL_XID *xid);
|
|
void mysql_query_cache_invalidate4(void* thd,
|
|
const char *key, unsigned int key_length,
|
|
int using_trx);
|