1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge MySQL 5.1.35 into MySQL 5.4

This commit is contained in:
Mikael Ronstrom
2009-06-11 12:07:59 +02:00
805 changed files with 37163 additions and 8825 deletions

View File

@ -321,6 +321,8 @@ struct system_variables
ulong net_write_timeout;
ulong optimizer_prune_level;
ulong optimizer_search_depth;
/* A bitmap for switching optimizations on/off */
ulong optimizer_switch;
ulong preload_buff_size;
ulong profiling_history_size;
ulong query_cache_type;
@ -664,7 +666,7 @@ public:
*/
char *db;
uint db_length;
size_t db_length;
public:
@ -811,6 +813,7 @@ public:
void
restore_security_context(THD *thd, Security_context *backup);
#endif
bool user_matches(Security_context *);
};
@ -1350,6 +1353,8 @@ public:
/* <> 0 if we are inside of trigger or stored function. */
uint in_sub_stmt;
/* TRUE when the current top has SQL_LOG_BIN ON */
bool sql_log_bin_toplevel;
/* container for handler's private per-connection data */
Ha_data ha_data[MAX_HA];
@ -1770,6 +1775,9 @@ public:
sp_cache *sp_proc_cache;
sp_cache *sp_func_cache;
/** number of name_const() substitutions, see sp_head.cc:subst_spvars() */
uint query_name_consts;
/*
If we do a purge of binary logs, log index info of the threads
that are currently reading it needs to be adjusted. To do that