database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge ../10.1 into bb-10.1-explain-json

Browse Source
This commit is contained in:
Sergei Petrunia
2014-10-15 17:21:59 +04:00
parent 041e03e251 fec5ab5a56
commit be1c17669c
2515 changed files with 52642 additions and 564022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sql/sql_lex.h
View File

@ -135,6 +135,9 @@ struct sys_var_with_base
#ifdef MYSQL_SERVER
extern const LEX_STRING null_lex_str;
extern const LEX_STRING empty_lex_str;
enum enum_sp_suid_behaviour
{
SP_IS_DEFAULT_SUID= 0,
@ -242,8 +245,7 @@ struct LEX_MASTER_INFO
heartbeat_period= 0;
ssl= ssl_verify_server_cert= heartbeat_opt=
repl_ignore_server_ids_opt= LEX_MI_UNCHANGED;
gtid_pos_str.length= 0;
gtid_pos_str.str= NULL;
gtid_pos_str= null_lex_str;
use_gtid_opt= LEX_GTID_UNCHANGED;
}
};
@ -1021,9 +1023,6 @@ struct st_sp_chistics
enum enum_sp_data_access daccess;
};
extern const LEX_STRING null_lex_str;
extern const LEX_STRING empty_lex_str;
struct st_trg_chistics
{
enum trg_action_time_type action_time;
@ -1035,9 +1034,6 @@ extern sys_var *trg_new_row_fake_var;
enum xa_option_words {XA_NONE, XA_JOIN, XA_RESUME, XA_ONE_PHASE,
XA_SUSPEND, XA_FOR_MIGRATE};
extern const LEX_STRING null_lex_str;
extern const LEX_STRING empty_lex_str;
class Sroutine_hash_entry;
/*
@ -2892,20 +2888,8 @@ public:
};
struct st_lex_local: public LEX
struct st_lex_local: public LEX, public Sql_alloc
{
static void *operator new(size_t size) throw()
{
return sql_alloc(size);
}
static void *operator new(size_t size, MEM_ROOT *mem_root) throw()
{
return (void*) alloc_root(mem_root, (uint) size);
}
static void operator delete(void *ptr,size_t size)
{ TRASH(ptr, size); }
static void operator delete(void *ptr, MEM_ROOT *mem_root)
{ /* Never called */ }
};
extern void lex_init(void);