mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
Jan Lindström 2e814d4702 Merge InnoDB 5.7 from mysql-5.7.9. 
Contains also

MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7

	The failure happened because 5.7 has changed the signature of
	the bool handler::primary_key_is_clustered() const
	virtual function ("const" was added). InnoDB was using the old
	signature which caused the function not to be used.

MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7

	Fixed mutexing problem on lock_trx_handle_wait. Note that
	rpl_parallel and rpl_optimistic_parallel tests still
	fail.

MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan)
  Reason: incorrect merge

MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan)
  Reason: incorrect merge
2016-09-02 13:22:28 +03:00
..
share clarify ER_CANT_DROP_FIELD_OR_KEY 2016-07-02 14:52:20 +02:00
add_errmsg
authors.h
bounded_queue.h
client_settings.h
CMakeLists.txt MDEV-5535: Cannot reopen temporary table 2016-06-10 18:39:43 -04:00
compat56.cc
compat56.h
contributors.h Update sponsors 2016-05-27 18:25:14 +02:00
create_options.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
create_options.h MDEV-9949 Connect Engine: long SRCDEF leads to broken table 2016-05-05 01:05:05 +02:00
custom_conf.h
datadict.cc
datadict.h
debug_sync.cc MDEV-6353 my_ismbchar() and my_mbcharlen() refactoring 2016-05-17 15:27:10 +04:00
debug_sync.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
derror.cc
derror.h
des_key_file.cc
des_key_file.h
discover.cc
discover.h
encryption.cc MDEV-9618 solaris sparc build fails on 10.1. 2016-05-04 11:42:39 +04:00
event_data_objects.cc
event_data_objects.h
event_db_repository.cc
event_db_repository.h
event_parse_data.cc
event_parse_data.h
event_queue.cc
event_queue.h
event_scheduler.cc MDEV-10043 - main.events_restart fails sporadically in buildbot (crashes upon 2016-06-20 15:17:10 +04:00
event_scheduler.h
events.cc Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
events.h
field.cc Removing duplicate code in double-to-longlong conversion. 2016-07-03 19:12:20 +04:00
field.h Removing duplicate code in double-to-longlong conversion. 2016-07-03 19:12:20 +04:00
field_conv.cc
filesort.cc MDEV-8989 ORDER BY optimizer ignores equality propagation 2016-07-01 16:44:17 +02:00
filesort.h MDEV-8989 ORDER BY optimizer ignores equality propagation 2016-07-01 16:44:17 +02:00
filesort_utils.cc
filesort_utils.h
gcalc_slicescan.cc
gcalc_slicescan.h
gcalc_tools.cc
gcalc_tools.h
gen_lex_hash.cc MDEV-9987 - gen_lex_hash leaks memory, making LeakSanitizer builds fail 2016-04-26 16:15:15 +04:00
gen_lex_token.cc
group_by_handler.cc
group_by_handler.h
gstream.cc
gstream.h
ha_partition.cc various cleanups 2016-06-30 11:43:02 +02:00
ha_partition.h various cleanups 2016-06-30 11:43:02 +02:00
handler.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
handler.h Merge InnoDB 5.7 from mysql-5.7.9. 2016-09-02 13:22:28 +03:00
hash_filo.cc
hash_filo.h
hostname.cc
hostname.h
init.cc
init.h
innodb_priv.h
item.cc Removing duplicate code in double-to-longlong conversion. 2016-07-03 19:12:20 +04:00
item.h Removing duplicate code in double-to-longlong conversion. 2016-07-03 19:12:20 +04:00
item_buff.cc
item_cmpfunc.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
item_cmpfunc.h Removing the "thd" argument from Item::create_field_for_create_select(). 2016-07-01 21:45:57 +04:00
item_create.cc
item_create.h
item_func.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
item_func.h Removing the "thd" argument from Item::create_field_for_create_select(). 2016-07-01 21:45:57 +04:00
item_geofunc.cc Removing the "thd" argument from Item::create_field_for_create_select(). 2016-07-01 21:45:57 +04:00
item_geofunc.h Removing the "thd" argument from Item::create_field_for_create_select(). 2016-07-01 21:45:57 +04:00
item_inetfunc.cc
item_inetfunc.h parentheses in default 2016-06-30 11:43:02 +02:00
item_row.cc cleanup: change Item::walk() to take void* not uchar* 2016-06-30 11:43:02 +02:00
item_row.h cleanup: change Item::walk() to take void* not uchar* 2016-06-30 11:43:02 +02:00
item_strfunc.cc Removing duplicate code in double-to-longlong conversion. 2016-07-03 19:12:20 +04:00
item_strfunc.h better ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED 2016-06-30 11:43:02 +02:00
item_subselect.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
item_subselect.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
item_sum.cc better ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED 2016-06-30 11:43:02 +02:00
item_sum.h better ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED 2016-06-30 11:43:02 +02:00
item_timefunc.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
item_timefunc.h Removing the "thd" argument from Item::create_field_for_create_select(). 2016-07-01 21:45:57 +04:00
item_windowfunc.cc
item_windowfunc.h better ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED 2016-06-30 11:43:02 +02:00
item_xmlfunc.cc cleanup: change Item::walk() to take void* not uchar* 2016-06-30 11:43:02 +02:00
item_xmlfunc.h MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard 2016-06-30 11:43:02 +02:00
key.cc
key.h
keycaches.cc
keycaches.h
lex.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
lex_symbol.h
lock.cc
lock.h
log.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
log.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
log_event.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
log_event.h MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard 2016-06-30 11:43:02 +02:00
log_event_old.cc Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
log_event_old.h
log_slow.h
main.cc
mdl.cc Merge tag 'mariadb-10.0.26' into 10.0-galera 2016-06-24 12:01:22 -04:00
mdl.h MDEV-9728 - Hard crash in metadata_lock_info 2016-06-23 12:06:16 +04:00
mem_root_array.h MDEV-9764: MariaDB does not limit memory used for range optimization 2016-05-31 17:59:04 +03:00
message.h
message.mc
message.rc
mf_iocache.cc
mf_iocache_encr.cc
MSG00001.bin
multi_range_read.cc
multi_range_read.h
my_apc.cc
my_apc.h
my_decimal.cc
my_decimal.h
my_json_writer.cc
my_json_writer.h
mysql_install_db.cc
mysql_upgrade_service.cc
mysqld.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
mysqld.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_index_cond_pushdown.cc
opt_range.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
opt_range.h
opt_range_mrr.cc MDEV-10175: range optimizer calls records_in_range() for full extended keys 2016-06-03 14:43:08 +03:00
opt_subselect.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
opt_subselect.h
opt_sum.cc
opt_table_elimination.cc cleanup: change Item::walk() to take void* not uchar* 2016-06-30 11:43:02 +02:00
parse_file.cc General spell fixing in comments and strings 2016-06-08 14:17:23 +03:00
parse_file.h
partition_element.h
partition_info.cc cleanup: change Item::walk() to take void* not uchar* 2016-06-30 11:43:02 +02:00
partition_info.h
password.c
plistsort.c
procedure.cc
procedure.h various cleanups 2016-06-30 11:43:02 +02:00
protocol.cc MDEV-10138 Support for decimals up to 38 digits 2016-06-22 22:04:55 +03:00
protocol.h MDEV-9947: COM_MULTI united response 2016-05-17 13:31:33 +02:00
records.cc
records.h
repl_failsafe.cc
repl_failsafe.h
replication.h
rpl_constants.h
rpl_filter.cc
rpl_filter.h
rpl_gtid.cc Fixed compiler warnings and test failures found by buildbot 2016-06-24 02:25:14 +03:00
rpl_gtid.h Final fixes for Memory_used 2016-04-28 17:15:38 +03:00
rpl_handler.cc
rpl_handler.h
rpl_injector.cc
rpl_injector.h
rpl_mi.cc
rpl_mi.h
rpl_parallel.cc Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
rpl_parallel.h
rpl_record.cc Merge branch '10.0' into 10.0-galera 2016-04-29 16:50:58 -04:00
rpl_record.h
rpl_record_old.cc
rpl_record_old.h
rpl_reporting.cc
rpl_reporting.h
rpl_rli.cc MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard 2016-06-30 11:43:02 +02:00
rpl_rli.h MDEV-5535: Cannot reopen temporary table 2016-06-10 18:39:43 -04:00
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
scheduler.cc cleanup: thread_count 2016-06-04 09:06:00 +02:00
scheduler.h
set_var.cc More tests for "MDEV-7563 Support CHECK constraint". 2016-06-30 11:43:02 +02:00
set_var.h Cleanups 2016-04-28 16:36:02 +03:00
sha2.cc
signal_handler.cc
slave.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
slave.h Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h General spell fixing in comments and strings 2016-06-08 14:17:23 +03:00
sql_acl.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_acl.h
sql_admin.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_admin.h
sql_alter.cc various cleanups 2016-06-30 11:43:02 +02:00
sql_alter.h various cleanups 2016-06-30 11:43:02 +02:00
sql_analyse.cc MDEV-10138 Support for decimals up to 38 digits 2016-06-22 22:04:55 +03:00
sql_analyse.h
sql_analyze_stmt.cc
sql_analyze_stmt.h
sql_array.h Cleanups 2016-04-28 16:36:02 +03:00
sql_audit.cc Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
sql_audit.h
sql_base.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_base.h various cleanups 2016-06-30 11:43:02 +02:00
sql_binlog.cc
sql_binlog.h
sql_bitmap.h
sql_bootstrap.cc
sql_bootstrap.h
sql_builtin.cc.in
sql_cache.cc Merge pull request #181 from ottok/ok-debpkg-10.2 2016-06-14 16:43:08 +04:00
sql_cache.h
sql_callback.h
sql_class.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_class.h clarify ER_CANT_DROP_FIELD_OR_KEY 2016-07-02 14:52:20 +02:00
sql_client.cc
sql_cmd.h
sql_connect.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_connect.h Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
sql_const.h MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard 2016-06-30 11:43:02 +02:00
sql_crypt.cc
sql_crypt.h
sql_cte.cc
sql_cte.h Fixed compiler warnings and test failures found by buildbot 2016-06-24 02:25:14 +03:00
sql_cursor.cc
sql_cursor.h
sql_db.cc Merge pull request #181 from ottok/ok-debpkg-10.2 2016-06-14 16:43:08 +04:00
sql_db.h
sql_delete.cc MDEV-8989: ORDER BY optimizer ignores equality propagation 2016-05-23 21:17:18 +03:00
sql_delete.h
sql_derived.cc MDEV-3944: Allow derived tables in VIEWS 2016-05-28 14:44:21 +02:00
sql_derived.h
sql_digest.cc
sql_digest.h
sql_digest_stream.h
sql_do.cc
sql_do.h
sql_error.cc MDEV-9947: COM_MULTI united response 2016-05-17 13:31:33 +02:00
sql_error.h MDEV-9947: COM_MULTI united response 2016-05-17 13:31:33 +02:00
sql_explain.cc
sql_explain.h
sql_expression_cache.cc
sql_expression_cache.h
sql_get_diagnostics.cc
sql_get_diagnostics.h
sql_handler.cc MDEV-5535: Cannot reopen temporary table 2016-06-10 18:39:43 -04:00
sql_handler.h
sql_help.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_help.h
sql_hset.h
sql_insert.cc Removing the "thd" argument from Item::create_field_for_create_select(). 2016-07-01 21:45:57 +04:00
sql_insert.h
sql_join_cache.cc cleanup: change Item::walk() to take void* not uchar* 2016-06-30 11:43:02 +02:00
sql_join_cache.h
sql_lex.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_lex.h revert second lookahead in the lexer 2016-06-30 11:43:02 +02:00
sql_lifo_buffer.h
sql_list.cc
sql_list.h fix the method name 2016-06-04 09:06:00 +02:00
sql_load.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_load.h
sql_locale.cc Merge branch '10.0' into 10.1 2016-05-04 15:23:26 +02:00
sql_locale.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_manager.cc
sql_manager.h
sql_parse.cc MDEV-10084: SQL batch united response 2016-07-04 16:02:49 +02:00
sql_parse.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_partition.cc various cleanups 2016-06-30 11:43:02 +02:00
sql_partition.h
sql_partition_admin.cc MDEV-5535: Cannot reopen temporary table 2016-06-10 18:39:43 -04:00
sql_partition_admin.h
sql_plist.h
sql_plugin.cc Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
sql_plugin.h Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
sql_plugin_compat.h
sql_plugin_services.ic
sql_prepare.cc MDEV-5535: Cannot reopen temporary table 2016-06-10 18:39:43 -04:00
sql_prepare.h
sql_priv.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_profile.cc Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
sql_profile.h Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
sql_reload.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_reload.h
sql_rename.cc
sql_rename.h
sql_repl.cc Merge branch '10.0' into 10.0-galera 2016-04-29 16:50:58 -04:00
sql_repl.h
sql_select.cc MDEV-8989 ORDER BY optimizer ignores equality propagation 2016-07-01 16:44:17 +02:00
sql_select.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_servers.cc Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
sql_servers.h
sql_show.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_show.h Merge tag 'mariadb-10.0.26' into 10.0-galera 2016-06-24 12:01:22 -04:00
sql_signal.cc
sql_signal.h
sql_sort.h
sql_state.c
sql_statistics.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_statistics.h
sql_string.cc MDEV-10138 Support for decimals up to 38 digits 2016-06-22 22:04:55 +03:00
sql_string.h
sql_table.cc fix ALTER TABLE .. DROP CONSTRAINT IF NOT EXISTS 2016-07-02 14:52:23 +02:00
sql_table.h
sql_tablespace.cc
sql_tablespace.h
sql_test.cc compilation warning 2016-06-30 11:43:02 +02:00
sql_test.h
sql_time.cc Fixed compiler warnings and test failures found by buildbot 2016-06-24 02:25:14 +03:00
sql_time.h
sql_trigger.cc MDEV-5535: Cannot reopen temporary table 2016-06-10 18:39:43 -04:00
sql_trigger.h
sql_truncate.cc
sql_truncate.h
sql_type.cc
sql_type.h
sql_udf.cc Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
sql_udf.h
sql_union.cc cleanup: change Item::walk() to take void* not uchar* 2016-06-30 11:43:02 +02:00
sql_union.h
sql_update.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sql_update.h
sql_view.cc MDEV-5535: Cannot reopen temporary table 2016-06-10 18:39:43 -04:00
sql_view.h
sql_window.cc Fixed compiler warnings and test failures found by buildbot 2016-06-24 02:25:14 +03:00
sql_window.h Cleanups 2016-04-28 16:36:02 +03:00
sql_yacc.yy Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
strfunc.cc
strfunc.h
structs.h
sys_vars.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sys_vars.ic Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
sys_vars_shared.h
table.cc don't save vcol flags in frm 2016-07-01 22:30:09 +02:00
table.h various cleanups 2016-06-30 11:43:02 +02:00
table_cache.cc MDEV-5535: Cannot reopen temporary table 2016-06-10 18:39:43 -04:00
table_cache.h MDEV-5535: Cannot reopen temporary table 2016-06-10 18:39:43 -04:00
temporary_tables.cc MDEV-10219 rpl.rpl_parallel_temptable failed in buildbot: Assertion `!table || !table->in_use || table->in_use == _current_thd()' failed 2016-06-22 22:04:55 +03:00
thr_malloc.cc
thr_malloc.h
threadpool.h
threadpool_common.cc cleanup: thread_count 2016-06-04 09:06:00 +02:00
threadpool_unix.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
threadpool_win.cc MDEV-9154 : Remove workarounds (mainly dynamic function loading) 2016-06-01 20:29:10 +02:00
transaction.cc
transaction.h
tzfile.h
tztime.cc Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
tztime.h
udf_example.c
udf_example.def
uniques.cc
uniques.h
unireg.cc don't save vcol flags in frm 2016-07-01 22:30:09 +02:00
unireg.h MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard 2016-06-30 11:43:02 +02:00
winservice.c MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the installer. Do not lauch upgrade wizard after installation 2016-05-24 23:15:00 +02:00
winservice.h
wsrep_applier.cc MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard 2016-06-30 11:43:02 +02:00
wsrep_applier.h MDEV-9618 solaris sparc build fails on 10.1. 2016-06-27 18:02:28 +04:00
wsrep_binlog.cc
wsrep_binlog.h MDEV-9618 solaris sparc build fails on 10.1. 2016-06-27 18:02:28 +04:00
wsrep_check_opts.cc
wsrep_dummy.cc
wsrep_hton.cc
wsrep_mysqld.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
wsrep_mysqld.h Code cleanup (wsrep patch). 2016-06-27 18:07:43 -04:00
wsrep_notify.cc
wsrep_priv.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
wsrep_sst.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
wsrep_sst.h MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno (postfix) 2016-06-01 13:15:38 -04:00
wsrep_thd.cc MDEV-5535: Cannot reopen temporary table 2016-06-10 18:39:43 -04:00
wsrep_thd.h
wsrep_utils.cc Reuse THD for new user connections 2016-06-04 09:06:00 +02:00
wsrep_utils.h Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
wsrep_var.cc Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
wsrep_var.h MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno 2016-05-31 20:37:00 -04:00
wsrep_xid.cc MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno 2016-05-31 20:37:00 -04:00
wsrep_xid.h MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno 2016-05-31 20:37:00 -04:00