mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
Kristian Nielsen 370318f894 MDEV-6386: Assertion `thd->transaction.stmt.is_empty() || thd->in_sub_stmt || (thd->state_flags & Open_tables_state::BACKUPS_AVAIL)' fails with parallel replication 
The direct cause of the assertion was missing error handling in
record_gtid(). If ha_commit_trans() fails for the statement commit, there was
missing code to catch the error and do ha_rollback_trans() in this case; this
caused close_thread_tables() to assert.

Normally, this error case is not hit, but in this case it was triggered due to
another bug: When a transaction T1 fails during parallel replication, the code
would signal following transactions that they could start to run without
properly marking the error condition. This caused subsequent transactions to
incorrectly start replicating, only to get an error later during their own
commit step. This was particularly serious if the subsequent transactions were
DDL or MyISAM updates, which cannot be rolled back and would leave replication
in an inconsistent state.

Fixed by 1) in case of error, only signal following transactions to continue
once the error has been properly marked and those transactions will know not
to start; and 2) implement proper error handling in record_gtid() in the case
that statement commit fails.
2014-06-27 13:34:29 +02:00
..
examples merge with 5.3 2011-10-19 21:45:18 +02:00
share 5.5.38 merge 2014-06-06 00:07:27 +02:00
add_errmsg
authors.h Updated sponsors and authors 2014-03-28 09:31:43 +02:00
bounded_queue.h MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line. 2012-09-01 14:21:59 -07:00
client_settings.h Do the partial merge of WL#5602 correctly: 2013-12-09 12:38:02 +01:00
CMakeLists.txt Moving implementation of INET_ATON() INET_NTOA() into 2014-05-30 15:24:25 +04:00
compat56.cc Adding support for MySQL-5.6 temporal column types: 2013-07-10 11:49:17 +04:00
compat56.h Adding support for MySQL-5.6 temporal column types: 2013-07-10 11:49:17 +04:00
contributors.h Updated sponsors and authors 2014-03-28 09:31:43 +02:00
create_options.cc bug in HA_TOPTION_SYSVAR of the enum type - enum string was generated incorrectly 2014-03-26 09:33:03 +01:00
create_options.h Enable TokuDB online ALTER 2013-09-25 19:42:22 +02:00
custom_conf.h Updated/added copyright headers 2014-01-06 10:52:35 +05:30
datadict.cc 5.5 merge and fixes for compiler/test errors 2013-09-18 13:07:31 +02:00
datadict.h remove dd_frm_type(), dd_frm_storage_engine(), dd_check_storage_engine_flag() 2013-04-09 15:50:30 +02:00
debug_sync.cc 10.0-base merge. 2013-09-21 10:14:42 +02:00
debug_sync.h mdl_sync now works. 2013-07-02 20:43:35 +03:00
derror.cc Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
derror.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
des_key_file.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
des_key_file.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
discover.cc 5.2 merge 2014-03-16 21:03:01 +01:00
discover.h 10.0-monty merge 2013-07-21 16:39:19 +02:00
event_data_objects.cc 10.0-base merge 2013-11-13 23:03:48 +01:00
event_data_objects.h 5.1 merge 2014-03-16 13:59:44 +01:00
event_db_repository.cc MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
event_db_repository.h 5.1 merge 2014-03-16 13:59:44 +01:00
event_parse_data.cc 10.0-monty merge 2013-07-21 16:39:19 +02:00
event_parse_data.h 5.3 merge 2012-01-13 15:50:02 +01:00
event_queue.cc 5.2 merge 2014-03-16 21:03:01 +01:00
event_queue.h 5.2 merge 2014-03-16 21:03:01 +01:00
event_scheduler.cc 5.2 merge 2014-03-16 21:03:01 +01:00
event_scheduler.h 10.0-base merge 2014-02-26 15:28:07 +01:00
events.cc Asserting correct database name lettercase in 2014-05-01 14:06:48 +02:00
events.h 5.1 merge 2014-03-16 13:59:44 +01:00
field.cc MDEV-6065 MySQL Bug#13623473 "MISSING ROWS ON SELECT AND JOIN WITH TIME/DATETIME COMPARE" 2014-06-11 10:08:08 +02:00
field.h MDEV-6065 MySQL Bug#13623473 "MISSING ROWS ON SELECT AND JOIN WITH TIME/DATETIME COMPARE" 2014-06-11 10:08:08 +02:00
field_conv.cc 5.2 merge 2014-03-16 21:03:01 +01:00
filesort.cc valgrind warning. initialize found_rows earlier, before any "goto err". 2014-06-12 10:57:03 +02:00
filesort.h MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line. 2012-09-01 14:21:59 -07:00
filesort_utils.cc MDEV-4011 Added per thread memory counting and usage 2013-01-23 16:16:14 +01:00
filesort_utils.h MDEV-5173 Cppcheck report 2014-03-19 09:58:06 +01:00
gcalc_slicescan.cc bug #977021 ST_BUFFER fails with the negative D. 2012-04-29 18:08:11 +05:00
gcalc_slicescan.h bug #901655 ST_BUFFER asserts with a coplicated shape. 2011-12-08 16:29:45 +04:00
gcalc_tools.cc 5.3 merge 2012-01-13 15:50:02 +01:00
gcalc_tools.h 5.3->5.5 merge 2011-11-27 17:46:20 +01:00
gen_lex_hash.cc Merge MySQL 5.1.66 -> MariaDB 5.1.65 2012-11-06 11:52:55 +02:00
gstream.cc 5.2 merge 2014-03-16 21:03:01 +01:00
gstream.h 5.2 merge 2014-03-16 21:03:01 +01:00
ha_ndbcluster.cc Fixed issues with partitions and create temporary table SELECT ... 2013-07-03 22:50:34 +03:00
ha_ndbcluster.h 5.2 merge 2014-03-16 21:03:01 +01:00
ha_ndbcluster_binlog.cc 5.2 merge 2014-03-16 21:03:01 +01:00
ha_ndbcluster_binlog.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
ha_ndbcluster_cond.cc 10.0-base merge 2014-02-26 15:28:07 +01:00
ha_ndbcluster_cond.h 10.0-base merge 2014-02-26 15:28:07 +01:00
ha_ndbcluster_tables.h Updated/added copyright headers 2014-01-06 10:52:35 +05:30
ha_partition.cc post-fix for the merge of "Bug#16216513 INPLACE ALTER DISABLED FOR PARTITIONED TABLES" 2014-05-08 10:25:09 +02:00
ha_partition.h 5.5 merge 2014-03-26 22:25:38 +01:00
handler.cc 5.5 merge 2014-05-09 12:35:11 +02:00
handler.h MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
hash_filo.cc mysql-5.1.73 merge 2014-03-15 18:24:15 +01:00
hash_filo.h List<>-style template wrapper over hash_filo 2014-03-19 09:57:09 +01:00
hostname.cc revno: 5305.1.1 2014-05-07 16:12:29 +02:00
hostname.h MDEV-4058 2013-06-27 12:51:34 +03:00
init.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
init.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
innodb_priv.h Percona-Server-5.6.14-rel62.0 merge 2013-12-22 17:06:50 +01:00
item.cc MDEV-6065 MySQL Bug#13623473 "MISSING ROWS ON SELECT AND JOIN WITH TIME/DATETIME COMPARE 2014-06-11 10:09:24 +02:00
item.h MDEV-5969 Crash in prepared statement with NO_ZERO_IN_DATE and ROLLUP 2014-03-29 11:33:20 +01:00
item_buff.cc Temporary commit of 10.0-merge 2013-03-26 00:03:13 +02:00
item_cmpfunc.cc MDEV-6102 Comparison between TIME and DATETIME does not use CURRENT_DATE 2014-06-06 10:29:52 +04:00
item_cmpfunc.h MDEV-6027 RLIKE: "." no longer matching new line 2014-04-23 10:57:25 +04:00
item_create.cc MDEV-4051 INET6_ATON() and INET6_NTOA() 2014-05-30 16:19:00 +04:00
item_create.h Adding support for the SQL-standard temporal literals. 2013-07-10 12:12:27 +04:00
item_func.cc 5.5.38 merge 2014-06-06 00:07:27 +02:00
item_func.h Moving implementation of INET_ATON() INET_NTOA() into 2014-05-30 15:24:25 +04:00
item_geofunc.cc 10.0-base merge 2014-02-26 15:28:07 +01:00
item_geofunc.h 5.2 merge 2014-03-16 21:03:01 +01:00
item_inetfunc.cc MDEV-4051 INET6_ATON() and INET6_NTOA() 2014-05-30 16:19:00 +04:00
item_inetfunc.h MDEV-4051 INET6_ATON() and INET6_NTOA() 2014-05-30 16:19:00 +04:00
item_row.cc 5.2 merge 2014-03-16 21:03:01 +01:00
item_row.h 5.3 merge 2012-01-13 15:50:02 +01:00
item_strfunc.cc MDEV-6314 - Compile/run MariaDB with ASan 2014-06-10 22:20:33 +04:00
item_strfunc.h Moving implementation of INET_ATON() INET_NTOA() into 2014-05-30 15:24:25 +04:00
item_subselect.cc MDEV-5401: Wrong result (missing row) on a 2nd execution of PS with exists_to_in=on, MERGE view or a SELECT SQ 2014-04-10 12:14:18 +03:00
item_subselect.h 10.0-base merge 2014-02-26 15:28:07 +01:00
item_sum.cc 5.2 merge 2014-03-16 21:03:01 +01:00
item_sum.h 5.2 merge 2014-03-16 21:03:01 +01:00
item_timefunc.cc MDEV-6102 Comparison between TIME and DATETIME does not use CURRENT_DATE 2014-06-06 10:29:52 +04:00
item_timefunc.h MDEV-4511 Assertion `scale <= precision' fails on GROUP BY TIMEDIFF with incorrect types 2014-04-24 16:59:01 +04:00
item_xmlfunc.cc MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
item_xmlfunc.h A joint patch for: 2014-03-23 15:15:07 +04:00
key.cc 10.0-base merge 2014-02-26 15:28:07 +01:00
key.h 10.0-base merge 2014-02-26 15:28:07 +01:00
keycaches.cc Fixed compiler warnings and a not critical memory leak 2013-04-17 22:33:33 +03:00
keycaches.h Fixed compiler warnings and a not critical memory leak 2013-04-17 22:33:33 +03:00
lex.h Merge the server part of MySQL WL#5522 - InnoDB transportable tablespaces. 2014-02-02 10:00:36 +01:00
lex_symbol.h Updated/added copyright headers 2014-01-06 10:52:35 +05:30
lock.cc 5.5 merge 2014-05-09 12:35:11 +02:00
lock.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
log.cc MDEV-5799: Error messages written upon LOST EVENTS incident are corrupted 2014-06-25 13:08:30 +02:00
log.h Fix for MDEV-5589: "Discrepancy in binlog on half-failed CREATE OR REPLACE" 2014-03-20 00:59:13 +02:00
log_event.cc MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
log_event.h MDEV-5799: Error messages written upon LOST EVENTS incident are corrupted 2014-06-25 13:08:30 +02:00
log_event_old.cc MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
log_event_old.h 5.2 merge 2014-03-16 21:03:01 +01:00
log_slow.h MDEV-407: Print EXPLAIN [ANALYZE] in the slow query log 2013-09-19 08:33:58 +04:00
main.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
mdl.cc MDEV-5792 - Deadlock between SELECTs from METADATA_LOCK_INFO and another 2014-04-23 11:34:06 +04:00
mdl.h Asserting correct database name lettercase in 2014-05-01 14:06:48 +02:00
mem_root_array.h Updated/added copyright headers 2014-01-06 10:52:35 +05:30
message.h MDEV-4447 MariaDB sources should have unix-style line endings everywhere 2014-02-27 12:00:16 +01:00
message.mc
message.rc
mf_iocache.cc mysql-5.1.73 merge 2014-03-15 18:24:15 +01:00
MSG00001.bin
multi_range_read.cc MDEV-5976: TokuDB: Wrong query result using mrr=on 2014-06-06 21:28:42 +04:00
multi_range_read.h merge 10.0-base -> 10.0 2013-09-26 21:20:15 +03:00
my_apc.cc Merge 10.0-base -> 10.0 2013-10-16 13:38:42 +04:00
my_apc.h MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
my_decimal.cc Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
my_decimal.h 5.2 merge 2014-03-16 21:03:01 +01:00
mysql_install_db.cc 10.0-base merge 2013-06-06 21:32:29 +02:00
mysql_upgrade_service.cc - Properly terminate options array with all-zero entry. 2011-05-20 01:38:42 +02:00
mysqld.cc MDEV-5995 MySQL Bug#12750920: EMBEDDED SERVER START/STOP. 2014-06-11 16:03:10 +05:00
mysqld.h 5.5 merge 2014-05-09 12:35:11 +02:00
mysqld_suffix.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
net_serv.cc 5.2 merge 2014-03-16 21:03:01 +01:00
nt_servc.cc Do not use SECONDS_IN_24H in nt_servc.cc. 2014-03-07 10:34:07 +04:00
nt_servc.h Bug#11754011: 45546: START WINDOWS SERVICE, THEN EXECUTE WHAT IS NEEDED. 2011-12-13 17:44:19 +02:00
opt_index_cond_pushdown.cc MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
opt_range.cc 5.5.38 merge 2014-06-06 00:07:27 +02:00
opt_range.h MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
opt_range_mrr.cc 10.0-monty merge 2013-07-21 16:39:19 +02:00
opt_subselect.cc cleanup: remove special case from store_key::store_key(), add Field_blob::new_key_field 2014-06-09 20:18:53 +02:00
opt_subselect.h 10.0-base merge 2014-02-26 15:28:07 +01:00
opt_sum.cc MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
opt_table_elimination.cc MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
parse_file.cc 5.3 merge 2012-05-04 07:16:38 +02:00
parse_file.h 5.3 merge 2012-05-04 07:16:38 +02:00
partition_element.h mysql-5.1.73 merge 2014-03-15 18:24:15 +01:00
partition_info.cc MDEV-5818: MySQL WL#6145: Separate the dependence of DATA DIRECTORY from symbolic links 2014-03-23 17:00:29 +02:00
partition_info.h 10.0-base merge 2014-02-26 15:28:07 +01:00
password.c MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
plistsort.c Precise GIS functions added. 2011-05-04 23:20:17 +05:00
procedure.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
procedure.h 5.2 merge 2014-03-16 21:03:01 +01:00
protocol.cc 5.5 merge 2014-05-09 12:35:11 +02:00
protocol.h 5.5 merge 2014-05-09 12:35:11 +02:00
records.cc 5.2 merge 2014-03-16 21:03:01 +01:00
records.h 5.3->5.5 merge 2011-11-22 18:04:38 +01:00
repl_failsafe.cc Merge 10.0-base -> 10.0 (GTID). 2013-04-17 15:17:01 +02:00
repl_failsafe.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
replication.h fixes for test failures 2012-09-27 20:09:46 +02:00
rpl_constants.h MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work 2013-12-09 12:37:45 +01:00
rpl_filter.cc 5.1 merge 2014-03-16 13:59:44 +01:00
rpl_filter.h 5.1 merge 2014-03-16 13:59:44 +01:00
rpl_gtid.cc MDEV-6386: Assertion `thd->transaction.stmt.is_empty() || thd->in_sub_stmt || (thd->state_flags & Open_tables_state::BACKUPS_AVAIL)' fails with parallel replication 2014-06-27 13:34:29 +02:00
rpl_gtid.h MDEV-5804: If same GTID is received on multiple master connections in multi-source replication, the event is double-executed causing corruption or replication failure 2014-03-12 00:14:49 +01:00
rpl_handler.cc MDEV-26: Global transaction ID. First alpha release. 2013-04-15 10:55:27 +02:00
rpl_handler.h cleanup: use MYF() for mysys flags 2013-01-23 16:18:09 +01:00
rpl_injector.cc MDEV-500: Session variable for server_id 2012-10-23 12:46:29 +02:00
rpl_injector.h mysql-5.1.73 merge 2014-03-15 18:24:15 +01:00
rpl_mi.cc MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
rpl_mi.h MDEV-6156: Parallel replication incorrectly caches charset between worker threads 2014-04-25 12:58:31 +02:00
rpl_parallel.cc MDEV-6386: Assertion `thd->transaction.stmt.is_empty() || thd->in_sub_stmt || (thd->state_flags & Open_tables_state::BACKUPS_AVAIL)' fails with parallel replication 2014-06-27 13:34:29 +02:00
rpl_parallel.h MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
rpl_record.cc 10.0-base merge 2014-02-26 15:28:07 +01:00
rpl_record.h 5.5 merge 2014-02-25 16:04:35 +01:00
rpl_record_old.cc MDEV-4506: parallel replication. 2013-09-16 14:33:49 +02:00
rpl_record_old.h 5.2 merge 2014-03-16 21:03:01 +01:00
rpl_reporting.cc MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
rpl_reporting.h MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
rpl_rli.cc MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
rpl_rli.h MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
rpl_tblmap.cc cleanup: use MYF() for mysys flags 2013-01-23 16:18:09 +01:00
rpl_tblmap.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
rpl_utility.cc MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
rpl_utility.h MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
scheduler.cc 5.2 merge 2014-03-16 21:03:01 +01:00
scheduler.h mysql-5.1.73 merge 2014-03-15 18:24:15 +01:00
set_var.cc 5.2 merge 2014-03-16 21:03:01 +01:00
set_var.h MDEV-6027 RLIKE: "." no longer matching new line 2014-04-23 10:57:25 +04:00
sha2.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
signal_handler.cc 5.2 merge 2014-03-16 21:03:01 +01:00
slave.cc MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
slave.h MDEV-6120: When slave stops with error, error message should indicate the failing GTID 2014-06-25 15:17:03 +02:00
sp.cc Asserting correct database name lettercase in 2014-05-01 14:06:48 +02:00
sp.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sp_cache.cc mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
sp_cache.h mysql-5.1.73 merge 2014-03-15 18:24:15 +01:00
sp_head.cc 5.5 merge 2014-05-09 12:35:11 +02:00
sp_head.h another post-fix patch for MDEV-5850: MySQL Bug#21317: SHOW CREATE DATABASE does not obey to lower_case_table_names 2014-03-29 11:33:25 +01:00
sp_pcontext.cc 10.0-monty merge 2013-07-21 16:39:19 +02:00
sp_pcontext.h Fixed memory leaks. alias.test now runs clean with valgrind 2013-06-20 14:49:25 +03:00
sp_rcontext.cc 10.0-monty merge 2013-07-21 16:39:19 +02:00
sp_rcontext.h 5.1 merge 2014-03-16 13:59:44 +01:00
spatial.cc 5.3 merge 2014-02-22 22:51:20 +01:00
spatial.h 5.2 merge 2014-03-16 21:03:01 +01:00
sql_acl.cc MDEV-6401 SET ROLE returning ERROR 1959 Invalid role specification for valid role 2014-06-27 09:32:55 +02:00
sql_acl.h 5.6-compatibility, per-host connect error counter is reset only after the 2014-05-07 16:13:00 +02:00
sql_admin.cc 5.5 merge 2014-05-09 12:35:11 +02:00
sql_admin.h 10.0-base merge 2014-02-26 15:28:07 +01:00
sql_alter.cc Implementation of MDEV-5491: CREATE OR REPLACE TABLE 2014-01-29 15:37:17 +02:00
sql_alter.h merge of "BUG# 13975227: ONLINE OPTIMIZE TABLE FOR INNODB TABLES" 2014-05-07 22:36:25 +02:00
sql_analyse.cc remove append_escaped(), use String::append_for_single_quote() instead 2014-03-26 09:41:52 +01:00
sql_analyse.h remove append_escaped(), use String::append_for_single_quote() instead 2014-03-26 09:41:52 +01:00
sql_array.h 5.2 merge 2014-03-16 21:03:01 +01:00
sql_audit.cc Merge with 5.5 2014-03-11 17:49:09 +02:00
sql_audit.h Merge with 10.0-base 2014-03-13 16:43:11 +02:00
sql_base.cc 5.5 merge 2014-05-09 12:35:11 +02:00
sql_base.h Implementation of MDEV-5491: CREATE OR REPLACE TABLE 2014-01-29 15:37:17 +02:00
sql_binlog.cc 10.0-base merge 2014-02-26 15:28:07 +01:00
sql_binlog.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_bitmap.h 5.2 merge 2014-03-16 21:03:01 +01:00
sql_bootstrap.cc MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails 2012-12-16 21:11:24 +01:00
sql_bootstrap.h MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails 2012-12-16 21:11:24 +01:00
sql_builtin.cc.in mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_cache.cc Asserting correct database name lettercase in 2014-05-01 14:06:48 +02:00
sql_cache.h MDEV-4786 merge 10.0-monty -> 10.0 2013-08-12 14:17:51 +02:00
sql_callback.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_class.cc 5.5 merge 2014-05-09 12:35:11 +02:00
sql_class.h 5.5 merge 2014-05-09 12:35:11 +02:00
sql_client.cc Temporary commit of 10.0-merge 2013-03-26 00:03:13 +02:00
sql_cmd.h 10.0-base merge (roles) 2013-10-29 15:08:44 +01:00
sql_connect.cc MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
sql_connect.h Bug#14003080:65104: MAX_USER_CONNECTIONS WITH PROCESSLIST EMPTY 2012-05-28 11:14:43 +05:30
sql_const.h MDEV-4841 Wrong character set of ADDTIME() and DATE_ADD() 2013-08-22 13:59:30 +04:00
sql_crypt.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sql_crypt.h Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
sql_cursor.cc Fixed bug mdev-5028. 2013-10-02 17:59:56 -07:00
sql_cursor.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_db.cc another post-fix patch for MDEV-5850: MySQL Bug#21317: SHOW CREATE DATABASE does not obey to lower_case_table_names 2014-03-29 11:33:25 +01:00
sql_db.h s/st_ha_create_information/HA_CREATE_INFO/ 2013-04-07 15:35:39 +02:00
sql_delete.cc MDEV-5433 select_result::send_error() is unused 2014-03-26 22:32:20 +01:00
sql_delete.h MWL#205 DELETE with result set (mdev-3814) 2013-08-06 13:31:38 -07:00
sql_derived.cc 5.5.38 merge 2014-06-06 00:07:27 +02:00
sql_derived.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_do.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_do.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_error.cc Fixed that rpl_row_create_table can be run with --ps-protocol 2014-02-22 03:11:56 +02:00
sql_error.h 5.5.38 merge 2014-06-06 00:07:27 +02:00
sql_explain.cc Merge 10.0-base -> 10.0 2013-10-16 20:20:20 +04:00
sql_explain.h Better comments 2013-10-17 17:50:30 +04:00
sql_expression_cache.cc 5.5 merge 2013-07-17 21:24:29 +02:00
sql_expression_cache.h fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00
sql_get_diagnostics.cc Fixed some memory leaks 2013-06-19 22:57:46 +03:00
sql_get_diagnostics.h Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
sql_handler.cc MDEV-5864 - Reduce usage of LOCK_open: TABLE_SHARE::tdc.free_tables 2014-03-20 11:11:13 +04:00
sql_handler.h merge with 5.3 2011-10-19 21:45:18 +02:00
sql_help.cc MySQL-5.5.36 merge 2014-02-17 11:00:51 +01:00
sql_help.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_hset.h find() method for Hash_set<>. 2013-10-18 12:36:03 -07:00
sql_insert.cc Fixed that the we don't change CREATE to CREATE OR REPLACE, except if the slave removed an existing table as part of CREATE. 2014-03-28 09:31:24 +02:00
sql_insert.h MDEV-9095: Executing triggers on slave in row-based replication 2014-03-19 11:00:56 +02:00
sql_join_cache.cc Fixed bug mdev-6071. 2014-06-10 10:34:58 -07:00
sql_join_cache.h Fixed bug mdev-6071. 2014-06-10 10:34:58 -07:00
sql_lex.cc 5.2 merge 2014-03-16 21:03:01 +01:00
sql_lex.h MDEV-5736 remove what remains from ONE_SHOT hack 2014-05-01 14:07:11 +02:00
sql_lifo_buffer.h 5.3 merge 2014-02-22 22:51:20 +01:00
sql_list.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_list.h Debugging aid: Add T* List<T>::elem(int n) which returns N-th element in the list. 2014-03-11 19:07:02 +01:00
sql_load.cc 5.5.38 merge 2014-06-06 00:07:27 +02:00
sql_load.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_locale.cc MDEV-5851 MySQL WL#5303 Romansh locale for DAYNAME, MONTHNAME, DATE_FORMAT 2014-04-24 10:30:13 +04:00
sql_locale.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_manager.cc 10.0-base merge 2014-02-26 15:28:07 +01:00
sql_manager.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_parse.cc MDEV-5998 MySQL Bug#11756966 - 48958: STORED PROCEDURES CAN BE LEVERAGED TO BYPASS DATABASE SECURITY 2014-06-05 15:59:35 +02:00
sql_parse.h MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
sql_partition.cc remove append_escaped(), use String::append_for_single_quote() instead 2014-03-26 09:41:52 +01:00
sql_partition.h MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1 2013-11-28 12:10:44 +01:00
sql_partition_admin.cc 10.0-base merge 2014-02-26 15:28:07 +01:00
sql_partition_admin.h Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
sql_plist.h merge 10-base->10.0 2013-11-11 23:40:53 +02:00
sql_plugin.cc 5.5 merge 2014-05-09 12:35:11 +02:00
sql_plugin.h remove sys_var specific restore_pluginvar_names() function, 2013-12-09 12:39:19 +01:00
sql_plugin_compat.h strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) 2013-04-17 19:42:34 +02:00
sql_plugin_services.h MroongaSE: addint thd_autoinc and thd_error_context plugin services 2013-12-12 19:18:49 +04:00
sql_prepare.cc MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
sql_prepare.h MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
sql_priv.h MDEV-6047: Make exists_to_in optimization ON by default 2014-06-09 13:42:21 +03:00
sql_profile.cc Temporary commit of 10.0-merge 2013-03-26 00:03:13 +02:00
sql_profile.h mysql-5.1.73 merge 2014-03-15 18:24:15 +01:00
sql_reload.cc MySQL WL#5522 - InnoDB transportable tablespaces. 2014-02-02 10:06:29 +01:00
sql_reload.h MySQL WL#5522 - InnoDB transportable tablespaces. 2014-02-02 10:06:29 +01:00
sql_rename.cc Implementation of MDEV-5491: CREATE OR REPLACE TABLE 2014-01-29 15:37:17 +02:00
sql_rename.h test_sql_discovery storage engine 2013-04-09 16:07:35 +02:00
sql_repl.cc 5.2 merge 2014-03-16 21:03:01 +01:00
sql_repl.h Merge MariaDB 10.0-base to 10.0. 2014-02-10 15:12:17 +01:00
sql_select.cc cleanup: remove special case from store_key::store_key(), add Field_blob::new_key_field 2014-06-09 20:18:53 +02:00
sql_select.h cleanup: remove special case from store_key::store_key(), add Field_blob::new_key_field 2014-06-09 20:18:53 +02:00
sql_servers.cc List<>-style template wrapper over hash_filo 2014-03-19 09:57:09 +01:00
sql_servers.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
sql_show.cc 5.5.38 merge 2014-06-06 00:07:27 +02:00
sql_show.h MDEV-5850: MySQL Bug#21317: SHOW CREATE DATABASE does not obey to lower_case_table_names 2014-03-23 15:43:57 +02:00
sql_signal.cc fix signal_demo3.test: fix a typo in the merge, and update results to match 5.6 2013-07-11 21:40:30 +02:00
sql_signal.h Finished merging wl5986 started by Igor. 2013-06-19 14:32:14 +03:00
sql_sort.h 5.2 merge 2014-03-16 21:03:01 +01:00
sql_state.c mysql-5.5.37 selective merge 2014-03-27 22:26:58 +01:00
sql_statistics.cc MDEV-6314 - Compile/run MariaDB with ASan 2014-06-10 22:20:33 +04:00
sql_statistics.h Code cleanup: 2014-03-27 13:08:00 +04:00
sql_string.cc 5.5.38 merge 2014-06-06 00:07:27 +02:00
sql_string.h 5.5.38 merge 2014-06-06 00:07:27 +02:00
sql_table.cc MDEV-4440 IF NOT EXISTS in multi-action ALTER does not work when the problem is created by a previous part of the ALTER. 2014-06-10 17:02:46 +05:00
sql_table.h merge of "BUG# 13975227: ONLINE OPTIMIZE TABLE FOR INNODB TABLES" 2014-05-07 22:36:25 +02:00
sql_tablespace.cc Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
sql_tablespace.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_test.cc 5.5 merge 2014-03-26 22:25:38 +01:00
sql_test.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_time.cc MDEV-6065 MySQL Bug#13623473 "MISSING ROWS ON SELECT AND JOIN WITH TIME/DATETIME COMPARE" 2014-06-11 10:08:08 +02:00
sql_time.h MDEV-6065 MySQL Bug#13623473 "MISSING ROWS ON SELECT AND JOIN WITH TIME/DATETIME COMPARE" 2014-06-11 10:08:08 +02:00
sql_trigger.cc 5.5 merge 2014-05-09 12:35:11 +02:00
sql_trigger.h Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
sql_truncate.cc 5.5.38 merge 2014-06-06 00:07:27 +02:00
sql_truncate.h 5.5.38 merge 2014-06-06 00:07:27 +02:00
sql_udf.cc 5.5 merge 2014-02-25 16:04:35 +01:00
sql_udf.h remove ULL() and LL(), because they're totally unnecessary 2013-04-07 14:00:16 +02:00
sql_union.cc Bug #18167356: EXPLAIN W/ EXISTS(SELECT* UNION SELECT*) 2014-04-28 21:07:27 +05:30
sql_union.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_update.cc 5.5.38 merge 2014-06-06 00:07:27 +02:00
sql_update.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_view.cc MDEV-5894 MySQL BUG#34750: Print database name in Unknown Table error message 2014-03-20 00:44:35 +01:00
sql_view.h Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
sql_yacc.yy MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
strfunc.cc 10.0-base merge 2014-02-26 15:28:07 +01:00
strfunc.h Fixed issues with partitions and create temporary table SELECT ... 2013-07-03 22:50:34 +03:00
structs.h 10.0-base merge (roles) 2013-10-29 15:08:44 +01:00
sys_vars.cc MDEV-6249 mark P_S STABLE and disable it by default 2014-06-09 20:00:23 +02:00
sys_vars.h Merge MariaDB 10.0-base to 10.0. 2014-02-10 15:12:17 +01:00
sys_vars_shared.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
table.cc 5.5.38 merge 2014-06-06 00:07:27 +02:00
table.h 5.5.38 merge 2014-06-06 00:07:27 +02:00
table_cache.cc MDEV-6314 - Compile/run MariaDB with ASan 2014-06-10 22:20:33 +04:00
table_cache.h MDEV-5864 - Reduce usage of LOCK_open: TABLE_SHARE::tdc.free_tables 2014-03-20 11:11:13 +04:00
thr_malloc.cc Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
thr_malloc.h MDEV-4011 Added per thread memory counting and usage 2013-01-23 16:16:14 +01:00
threadpool.h MDEV-5205 - MariaDB does not start if more than 128 cpu's are available 2013-11-05 09:18:59 +04:00
threadpool_common.cc MDEV-5205 - MariaDB does not start if more than 128 cpu's are available 2013-11-05 09:18:59 +04:00
threadpool_unix.cc Fixing AIX compilation failires 2014-02-27 19:44:00 +04:00
threadpool_win.cc merge with 5.5 2012-11-03 12:28:51 +01:00
transaction.cc merge MySQL-5.6 bugfix "Bug#17862905: MYSQLDUMP CREATES USELESS METADATA LOCKS" 2014-05-05 23:53:31 +02:00
transaction.h Updated/added copyright headers 2014-01-06 10:52:35 +05:30
tzfile.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
tztime.cc MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits 2014-05-13 11:53:30 +02:00
tztime.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
udf_example.c 5.3 merge 2012-01-13 15:50:02 +01:00
udf_example.def
uniques.cc MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
unireg.cc MDEV-6106 Cannot create a table with 229 or greater columns in TokuDB 2014-05-01 14:04:00 +02:00
unireg.h 10.0-monty merge 2013-07-21 16:39:19 +02:00
winservice.c Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
winservice.h fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00