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

References lp:1115708 - merged with lp:mariadb/5.5 revision 3657

Browse Source
This commit is contained in:
Seppo Jaakola
2013-02-05 20:19:47 +02:00
parent d5dc568f9b bfd179e8ed
commit 18c97eea5c
621 changed files with 20590 additions and 10412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/sql_class.h
View File

@ -1751,7 +1751,7 @@ public:
bool save_prep_leaf_list;
#ifndef MYSQL_CLIENT
int binlog_setup_trx_data();
binlog_cache_mngr * binlog_setup_trx_data();
/*
Public interface to write RBR events to the binlog
@ -2226,6 +2226,7 @@ public:
bool no_errors;
uint8 password;
uint8 failed_com_change_user;
/**
Set to TRUE if execution of the current compound statement
@ -2762,6 +2763,19 @@ public:
{
return ::killed_errno(killed);
}
inline void reset_killed()
{
/*
Resetting killed has to be done under a mutex to ensure
its not done during an awake() call.
*/
if (killed != NOT_KILLED)
{
mysql_mutex_lock(&LOCK_thd_data);
killed= NOT_KILLED;
mysql_mutex_unlock(&LOCK_thd_data);
}
}
inline void send_kill_message() const
{
int err= killed_errno();
@ -3902,6 +3916,8 @@ class Unique :public Sql_alloc
uint full_size;
uint min_dupl_count; /* always 0 for unions, > 0 for intersections */
bool merge(TABLE *table, uchar *buff, bool without_last_merge);
public:
ulong elements;
Unique(qsort_cmp2 comp_func, void *comp_func_fixed_arg,
@ -3942,7 +3958,7 @@ public:
}
void reset();
bool walk(tree_walk_action action, void *walk_action_arg);
bool walk(TABLE *table, tree_walk_action action, void *walk_action_arg);
uint get_size() const { return size; }
ulonglong get_max_in_memory_size() const { return max_in_memory_size; }