mirror of
https://github.com/MariaDB/server.git
synced 2025-07-26 07:02:12 +03:00
5.5 merge
This commit is contained in:
BUILD
CMakeLists.txtVERSIONclient
cmake
configure.plcpack_rpm.cmakecreate_initial_db.cmake.ininfo_macros.cmake.ininstall_layout.cmakemysql_version.cmakepackage_name.cmakeplugin.cmake
debian
dist
patches
include
ma_dyncol.hmy_pthread.h
mysql
mysql_com.hservice_versions.hlibmysql
libmysqld
libservices
mysql-test
extra
binlog_tests
include
lib
mysql-test-run.plr
alias.resultchange_user_notembedded.resultcontributors.resultcreate_delayed.resultctype_ucs.resultctype_utf16.resultctype_utf8.resultdatetime_456.resultderived_view.resultdistinct.resultfailed_auth_3909.resultfunc_gconcat.resultfunc_misc.resultfunc_time.resultgis2.resultgrant_lowercase.resultgroup_by.resultgroup_by_innodb.resultgroup_min_max.resulthandlersocket.resultinformation_schema2.resultinnodb_mrr_cpk.resultloaddata.resultlowercase_table4.resultmysql.resultmysqltest.resultpartition_innodb.resultplugin.resultplugin_auth.resultrange.resultrange_mrr_icp.resultshow_check.resultsp.resultsp_notembedded.resultsubselect4.resultsubselect_innodb.resultsubselect_sj.resultsubselect_sj_jcl6.resultsum_distinct-big.resulttype_year.resultupdate.resultview.result
suite
binlog
r
binlog_database.resultbinlog_mysqlbinlog-cp932.resultbinlog_mysqlbinlog2.resultbinlog_mysqlbinlog_base64.resultbinlog_mysqlbinlog_row.resultbinlog_mysqlbinlog_row_innodb.resultbinlog_mysqlbinlog_row_myisam.resultbinlog_mysqlbinlog_row_trans.resultbinlog_row_annotate.resultbinlog_row_mysqlbinlog_options.resultbinlog_row_mysqlbinlog_verbose.result
t
binlog_mysqlbinlog-cp932-master.optbinlog_mysqlbinlog-cp932.testbinlog_mysqlbinlog2-master.optbinlog_mysqlbinlog2.testbinlog_mysqlbinlog_base64.testbinlog_mysqlbinlog_row-master.optbinlog_mysqlbinlog_row.testbinlog_mysqlbinlog_row_innodb-master.optbinlog_mysqlbinlog_row_innodb.testbinlog_mysqlbinlog_row_myisam-master.optbinlog_mysqlbinlog_row_myisam.testbinlog_mysqlbinlog_row_trans-master.optbinlog_mysqlbinlog_row_trans.test
innodb
r
auto_increment_dup.resultbinlog_consistent.resultinnodb-autoinc.resultinnodb-zip.resultinnodb.resultinnodb_bug14704286.resultinnodb_bug53591.resultinnodb_bug60196.resultinnodb_prefix_index_liftedlimit.result
t
maria
perfschema
include
r
t
plugins
rpl
sphinx
sys_vars
r
innodb_change_buffering_debug_basic.resultinnodb_changed_pages_limit_basic.resultinnodb_locking_fake_changes_basic.resultinnodb_max_bitmap_file_size_basic.resultpseudo_thread_id_basic.result
t
vcol
t
alias.testchange_user_notembedded.testcreate_delayed.testctype_ucs.testctype_utf16.testctype_utf8.testderived_view.testdistinct.testfailed_auth_3909.testfunc_gconcat.testfunc_misc.testgis2.testgrant_lowercase.optgrant_lowercase.testgroup_by.testgroup_by_innodb.testgroup_min_max.testinformation_schema2.testinnodb_mrr_cpk.testloaddata.testlowercase_table4-master.optlowercase_table4.testmysql.testmysqlshow.testpartition_innodb.testplugin.testplugin_auth.testrange.testrange_vs_index_merge.testrange_vs_index_merge_innodb.testshow_check.testsp.testsp_notembedded.testsubselect4.testsubselect_innodb.testsubselect_sj.testsum_distinct-big.testupdate.testview.test
valgrind.suppmysys
packaging/rpm-uln
CMakeLists.txtREADME-ULNREADME.mysql-docsfilter-requires-mysql.shgenerate-tarball.shmy.cnfmy_config.hmysql-5.5-errno.patchmysql-5.5-fix-tests.patchmysql-5.5-libdir.patchmysql-5.5-mtr1.patchmysql-5.5-stack-guard.patchmysql-5.5-testing.patchmysql-chain-certs.patchmysql-embedded-check.cmysql-expired-certs.patchmysql-install-test.patchmysql-strmov.patchmysql.initmysql.spec.shscriptstub.c
plugin/feedback
scripts
CMakeLists.txtmysql_install_db.pl.inmysql_install_db.shmysql_performance_tables.sqlmysql_system_tables.sqlmysql_system_tables_fix.sqlmysqlaccess.shmysqld_multi.shmysqld_safe.sh
sql-common
sql
CMakeLists.txtevent_db_repository.ccfield.ccfield.hfilesort.ccha_ndbcluster_binlog.ccha_partition.ccha_partition.hhandler.cchandler.hhostname.ccitem.ccitem.hitem_cmpfunc.ccitem_cmpfunc.hitem_func.ccitem_func.hitem_geofunc.ccitem_geofunc.hitem_row.ccitem_strfunc.ccitem_strfunc.hitem_subselect.ccitem_sum.ccitem_sum.hitem_timefunc.ccitem_timefunc.hitem_xmlfunc.ccitem_xmlfunc.hlog.cclog_event.cclog_event.hlog_event_old.ccmdl.ccmysqld.ccmysqld.hopt_range.ccopt_range.hopt_range_mrr.ccopt_subselect.ccrecords.ccrpl_mi.hrpl_rli.ccsp.ccsp_head.ccsp_rcontext.ccsp_rcontext.hsql_acl.ccsql_audit.ccsql_audit.hsql_base.ccsql_class.ccsql_class.hsql_connect.ccsql_const.hsql_db.ccsql_handler.ccsql_help.ccsql_insert.ccsql_lex.ccsql_list.hsql_load.ccsql_parse.ccsql_plugin.ccsql_plugin_services.hsql_priv.hsql_profile.ccsql_profile.hsql_repl.ccsql_repl.hsql_select.ccsql_show.ccsql_signal.ccsql_statistics.ccsql_time.ccsql_truncate.ccsql_union.ccsql_update.ccsql_yacc.yytable.cctable.htztime.ccuniques.cc
storage
innobase
btr
buf
dict
fil
handler
ibuf
include
log
os
page
row
maria
myisam
perfschema
sphinx
xtradb
strings
support-files
tests
win
@ -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
|
||||
@ -2234,6 +2234,7 @@ public:
|
||||
|
||||
bool no_errors;
|
||||
uint8 password;
|
||||
uint8 failed_com_change_user;
|
||||
|
||||
/**
|
||||
Set to TRUE if execution of the current compound statement
|
||||
@ -2748,6 +2749,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();
|
||||
@ -3974,6 +3988,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,
|
||||
@ -4014,7 +4030,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; }
|
||||
|
Reference in New Issue
Block a user