mariadb/sql
Kristian Nielsen 1cf852d874 MDEV-9383: Server fails to read master.info after upgrade 10.0 -> 10.1
In some cases, MariaDB 10.0 could write a master.info file that was read
incorrectly by 10.1 and could cause server to fail to start after an upgrade.

(If writing a new master.info file that is shorter than the old, extra
junk may remain at the end of the file. This is handled properly in
10.1 with an END_MARKER line, but this line is not written by
10.0. The fix here is to make 10.1 robust at reading the master.info
files written by 10.0).

Fix several things around reading master.info and read_mi_key_from_file():

 - read_mi_key_from_file() did not distinguish between a line with and
   without an eqals '=' sign.

 - If a line was empty, read_mi_key_from_file() would incorrectly return
   the key from the previous call.

 - An extra using_gtid=X line left-over by MariaDB 10.0 might incorrectly
   be read and overwrite the correct value.

 - Fix incorrect usage of strncmp() which should be strcmp().

 - Add test cases.
2016-04-08 10:31:03 +02:00
..
share Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
add_errmsg
authors.h MDEV-6821, MDEV-6826 - Update authors and contributors 2016-02-04 16:00:11 +02:00
bounded_queue.h
client_settings.h MDEV-9346 - The federatedx and spider engine make mysqld crash when they are 2016-02-16 18:40:04 +04:00
CMakeLists.txt MDEV-427/MDEV-5713 Add systemd script with notify functionality 2015-10-12 17:51:49 +02: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 Update sponsors 2016-03-15 14:41:29 +02:00
create_options.cc - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
create_options.h MDEV-5867 ALTER TABLE t1 ENGINE=InnoDB keeps bad options when t1 ENGINE is CONNECT 2014-07-08 19:39:27 +02:00
custom_conf.h Updated/added copyright headers 2014-01-06 10:52:35 +05:30
datadict.cc Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
datadict.h
debug_sync.cc - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
debug_sync.h mdl_sync now works. 2013-07-02 20:43:35 +03:00
derror.cc - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
derror.h
des_key_file.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
des_key_file.h
discover.cc fix extension_based_table_discovery for partitioned tables 2016-03-21 11:43:19 +01:00
discover.h 10.0-monty merge 2013-07-21 16:39:19 +02:00
encryption.cc make encrypt-binlog and encrypt-tmp-files to fail if no encryption 2015-09-09 14:22:22 +02:00
event_data_objects.cc - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
event_data_objects.h compiler warnings 2014-10-01 23:38:26 +02:00
event_db_repository.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
event_db_repository.h MDEV-7281 EVENT: CREATE OR REPLACE 2015-02-27 13:34:18 +04:00
event_parse_data.cc - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
event_parse_data.h compiler warnings 2014-10-01 23:38:26 +02:00
event_queue.cc Fix spelling: occurred, execute, which etc 2016-03-04 02:09:37 +02:00
event_queue.h 5.2 merge 2014-03-16 21:03:01 +01:00
event_scheduler.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-09-01 18:42:02 +03:00
event_scheduler.h 10.0-base merge 2014-02-26 15:28:07 +01:00
events.cc MDEV-717 LP:1003679 - Wrong binlog order on concurrent DROP schema and CREATE function. 2016-03-23 12:16:39 +04:00
events.h Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
field.cc MDEV-9604 crash in Item::save_in_field with empty enum value 2016-03-23 08:26:40 +04:00
field.h Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
field_conv.cc MDEV-5542: GROUP_CONCAT truncate output to 65.536 chars when using DISTINCT or ORDER BY 2016-03-01 21:10:59 +01:00
filesort.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
filesort.h MDEV-7836: ANALYZE FORMAT=JSON should provide info about GROUP/ORDER BY 2015-04-12 04:48:42 +03:00
filesort_utils.cc MDEV-4285 Server crashes in ptr_compare on NOW and CAST in ORDER BY 2014-11-18 22:27:31 +01:00
filesort_utils.h MDEV-5173 Cppcheck report 2014-03-19 09:58:06 +01:00
gcalc_slicescan.cc Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
gcalc_slicescan.h MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11" 2016-03-18 16:55:11 +01:00
gcalc_tools.cc Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
gcalc_tools.h MDEV-7925 Inconsistent behavior of ST_Touches with a POINT as one of arguments. 2015-06-22 23:33:35 +05:00
gen_lex_hash.cc
gen_lex_token.cc Merge branch '10.0' into 10.1 2015-09-03 12:58:41 +02:00
group_by_handler.cc cleanups and simplifications 2015-10-05 17:14:15 +02:00
group_by_handler.h remove unused group_by_handler::init() method 2015-10-05 17:14:16 +02:00
gstream.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
gstream.h 5.2 merge 2014-03-16 21:03:01 +01:00
ha_partition.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
ha_partition.h MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) 2014-10-11 18:53:06 +02:00
handler.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
handler.h Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
hash_filo.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
hash_filo.h List<>-style template wrapper over hash_filo 2014-03-19 09:57:09 +01:00
hostname.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
hostname.h MDEV-4058 2013-06-27 12:51:34 +03:00
init.cc MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in many 2015-12-16 19:39:00 +04:00
init.h
innodb_priv.h move userstat tables to a plugin 2014-10-11 18:53:05 +02:00
item.cc MDEV-9604 crash in Item::save_in_field with empty enum value 2016-03-23 08:26:40 +04:00
item.h Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
item_buff.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
item_cmpfunc.cc MDEV-9369 IN operator with ( num, NULL ) gives inconsistent result 2016-03-21 11:21:44 +04:00
item_cmpfunc.h MDEV-9369 IN operator with ( num, NULL ) gives inconsistent result 2016-03-21 11:21:44 +04:00
item_create.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-09-01 18:42:02 +03:00
item_create.h Moving Item::str_value from public to protected. 2014-09-03 01:56:21 +04:00
item_func.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
item_func.h MDEV-9653 Assertion `length || !scale' failed in uint my_decimal_length_to_precision(uint, uint, bool) 2016-03-18 17:50:18 +04:00
item_geofunc.cc Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
item_geofunc.h A clean-up for MDEV-7950: 2015-10-04 09:37:57 +04:00
item_inetfunc.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
item_inetfunc.h MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) 2015-08-21 10:40:39 +04:00
item_row.cc MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) 2015-08-21 10:40:39 +04:00
item_row.h MDEV-9369 IN operator with ( num, NULL ) gives inconsistent result 2016-03-21 11:21:44 +04:00
item_strfunc.cc Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
item_strfunc.h A clean-up patch for Item_func_conv_charset (needed for MDEV-9181) 2016-01-26 17:52:24 +04:00
item_subselect.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
item_subselect.h Merge branch '10.0' into 10.1 2015-10-12 00:37:58 +02:00
item_sum.cc MDEV-5542: GROUP_CONCAT truncate output to 65.536 chars when using DISTINCT or ORDER BY 2016-03-01 21:10:59 +01:00
item_sum.h MDEV-9656 Assertion `0' failed in Item_sum_field::get_tmp_table_field(). 2016-03-16 13:43:06 +04:00
item_timefunc.cc Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
item_timefunc.h MDEV-8912 Wrong metadata or type for @c:=string_or_blob_field 2015-10-07 20:19:29 +04:00
item_xmlfunc.cc Stage 2 of MDEV-6152: 2015-08-21 10:40:51 +04:00
item_xmlfunc.h MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) 2015-08-21 10:40:39 +04:00
key.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
key.h 10.0-base merge 2014-02-26 15:28:07 +01:00
keycaches.cc Merge 10.0-galera into 10.1 2015-02-06 16:14:23 +01:00
keycaches.h cleanup: more 'const' qualifiers 2014-10-10 22:27:41 +02:00
lex.h Merge tag 'mariadb-10.0.19' into 10.1 2015-06-01 15:51:25 +02:00
lex_symbol.h Updated/added copyright headers 2014-01-06 10:52:35 +05:30
lock.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
lock.h MDEV-7004 - Merge scalability fixes from 10.0-power 2014-12-05 11:01:49 +04:00
log.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
log.h Merge tag 'mariadb-10.0.22' into 10.0-galera 2015-10-31 18:07:02 -04:00
log_event.cc MDEV-6058 MySQL Bug #11766693: LOG-SLOW-ADMIN-STATEMENTS AND 2016-03-22 23:26:39 +04:00
log_event.h Ignore MySQL 5.7 log events not relevant for MariaDB 2015-11-10 13:46:57 +02:00
log_event_old.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
log_event_old.h Remove THD argment from Log_event->net_send() and Protocol::pack_info() as 2015-10-22 17:00:58 +03:00
log_slow.h Add parenthesis in macro definitions to prevent order of operation problems. 2015-07-16 16:03:06 -07:00
main.cc
mdl.cc Merge branch '10.0-galera' into bb-10.1-serg 2016-02-24 01:21:40 -05:00
mdl.h Merge branch 'github/10.0-galera' into 10.1 2015-11-19 17:48:36 +01:00
mem_root_array.h Updated/added copyright headers 2014-01-06 10:52:35 +05:30
message.h CRLF->LF 2015-06-02 22:07:47 +02:00
message.mc
message.rc CRLF->LF 2015-06-02 22:07:47 +02:00
mf_iocache.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
mf_iocache_encr.cc make encrypt-binlog and encrypt-tmp-files to fail if no encryption 2015-09-09 14:22:22 +02:00
MSG00001.bin
multi_range_read.cc MDEV-7943 - pthread_getspecific() takes 0.76% in OLTP RO 2015-06-19 15:06:34 +04:00
multi_range_read.h Merge 2014-10-29 15:20:46 +03:00
my_apc.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
my_apc.h MDEV-8030 - Apc_target::disable() locks mutex twice 2015-06-23 09:54:36 +04:00
my_decimal.cc Adding "const" qualifier to arguments of date2my_decimal() 2015-10-22 09:11:23 +04:00
my_decimal.h Adding "const" qualifier to arguments of date2my_decimal() 2015-10-22 09:11:23 +04:00
my_json_writer.cc MDEV-7836: ANALYZE FORMAT=JSON should provide info about GROUP/ORDER BY 2015-04-12 04:48:42 +03:00
my_json_writer.h MDEV-7836: ANALYZE FORMAT=JSON should provide info about GROUP/ORDER BY 2015-04-12 04:48:42 +03:00
mysql_install_db.cc Update AskMonty and Atlassian references to MariaDB 2016-03-08 15:24:01 +02:00
mysql_upgrade_service.cc
mysqld.cc MDEV-6058 MySQL Bug #11766693: LOG-SLOW-ADMIN-STATEMENTS AND 2016-03-22 23:26:39 +04:00
mysqld.h MDEV-9641 MDEV-9644 NULLIF assertions 2016-03-05 16:25:29 +01:00
mysqld_suffix.h
net_serv.cc Merge branch '10.0' into 10.1 2016-01-25 22:58:57 +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
opt_index_cond_pushdown.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-08-27 22:21:08 +03:00
opt_range.cc Merge branch '10.0' into 10.1 2016-02-02 13:07:53 +02:00
opt_range.h MDEV-8779: mysqld got signal 11 in sql/opt_range_mrr.cc:100(step_down_to) 2015-09-21 17:08:27 +03:00
opt_range_mrr.cc 10.0-monty merge 2013-07-21 16:39:19 +02:00
opt_subselect.cc Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
opt_subselect.h Merge branch '10.0' into 10.1 2015-09-03 12:58:41 +02:00
opt_sum.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
opt_table_elimination.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-08-27 22:21:08 +03:00
parse_file.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-08-27 22:21:08 +03:00
parse_file.h MDEV-7671: Cache VIEW definitions in the TDC 2015-03-11 17:39:15 +01:00
partition_element.h mysql-5.1.73 merge 2014-03-15 18:24:15 +01:00
partition_info.cc Merge branch '10.0' into 10.1 2015-10-12 00:37:58 +02:00
partition_info.h MDEV-6152: Remove calls to current_thd while creating Item 2015-08-27 22:29:11 +03: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
procedure.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
procedure.h MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) 2015-08-21 10:40:39 +04:00
protocol.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
protocol.h Remove THD argment from Log_event->net_send() and Protocol::pack_info() as 2015-10-22 17:00:58 +03:00
records.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
records.h Fixed MDEV-8408 2015-10-23 18:49:02 +03:00
repl_failsafe.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-08-27 22:21:08 +03:00
repl_failsafe.h
replication.h MDEV-162 Enhanced semisync replication 2014-12-23 14:16:32 +01:00
rpl_constants.h MDEV-8264 encryption for binlog 2015-09-04 10:33:55 +02:00
rpl_filter.cc MDEV-6676: Optimistic parallel replication 2015-02-07 09:42:58 +01:00
rpl_filter.h MDEV-6676: Optimistic parallel replication 2015-02-07 09:42:58 +01:00
rpl_gtid.cc Fix to ensure updates in gtid_slave_state table do not get binlogged. 2016-02-24 23:32:37 -05:00
rpl_gtid.h Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
rpl_handler.cc Merge branch '10.0' into 10.1 2015-09-03 12:58:41 +02:00
rpl_handler.h MDEV-162 Enhanced semisync replication 2014-12-23 14:16:32 +01:00
rpl_injector.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
rpl_injector.h Merge branch '10.1' of github.com:MariaDB/server into 10.1 2015-07-09 14:47:32 +03:00
rpl_mi.cc MDEV-9383: Server fails to read master.info after upgrade 10.0 -> 10.1 2016-04-08 10:31:03 +02:00
rpl_mi.h Merge branch '10.0' into 10.1 2016-01-25 22:58:57 +01:00
rpl_parallel.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
rpl_parallel.h Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
rpl_record.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
rpl_record.h 5.5 merge 2014-02-25 16:04:35 +01:00
rpl_record_old.cc remove unneded #include's that had a dubious explanation 2015-10-24 19:58:34 +02:00
rpl_record_old.h 5.2 merge 2014-03-16 21:03:01 +01:00
rpl_reporting.cc Merge branch '5.5' into 10.0 2016-02-15 22:50:59 +01: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 Merge branch '10.0' into 10.1 2016-01-25 22:58:57 +01:00
rpl_rli.h Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
rpl_tblmap.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
rpl_tblmap.h
rpl_utility.cc MDEV-9560 Mariadb 10.1 Crashes when replicating from 10.0 2016-02-23 10:46:16 +01: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 comment spelling Initailize -> Initialize 2015-12-11 15:21:42 +01:00
scheduler.h MDEV-5706 MariaDB does not build on hurd-i386 2014-07-25 14:15:33 +02:00
set_var.cc MDEV-9516 type error when setting session variable 2016-03-22 00:09:04 +04:00
set_var.h MDEV-9516 type error when setting session variable 2016-03-22 00:09:04 +04:00
sha2.cc
signal_handler.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
slave.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
slave.h MDEV-5273 Prepared statement doesn't return metadata after prepare. 2016-01-28 11:12:03 +04:00
sp.cc Followup for 2783fc7: return an error to the caller if mysql.proc cannot be opened 2016-03-24 09:45:28 +01:00
sp.h MDEV-717 LP:1003679 - Wrong binlog order on concurrent DROP schema and CREATE function. 2016-03-23 12:16:39 +04:00
sp_cache.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
sp_cache.h mysql-5.1.73 merge 2014-03-15 18:24:15 +01:00
sp_head.cc MDEV-9641 MDEV-9644 NULLIF assertions 2016-03-05 16:25:29 +01:00
sp_head.h Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sp_pcontext.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-08-27 22:21:08 +03:00
sp_pcontext.h parser cleanup: don't store field properties in LEX, use Create_field directly 2014-12-04 16:09:34 +01:00
sp_rcontext.cc Stage 2 of MDEV-6152: 2015-08-21 10:40:51 +04:00
sp_rcontext.h MDEV-7943 - pthread_getspecific() takes 0.76% in OLTP RO 2015-05-13 15:56:56 +04:00
spatial.cc Merge branch '10.0' into bb-10.1-merge 2014-12-02 22:25:16 +01:00
spatial.h Moving ST_RELATE() implementation out of Item_func_precise_spatial_rel, 2015-06-26 15:42:49 +04:00
sql_acl.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_acl.h MDEV-5273 Prepared statement doesn't return metadata after prepare. 2016-01-28 11:12:03 +04:00
sql_admin.cc MDEV-9590: Always print "Engine-independent statistic" warnings and might be filtering columns unintentionally from engines 2016-03-21 11:48:04 +01:00
sql_admin.h MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client() 2015-09-06 22:26:33 +02:00
sql_alter.cc - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03: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 MDEV-6152: Remove calls to current_thd while creating Item 2015-08-27 22:21:08 +03:00
sql_analyse.h MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) 2015-08-21 10:40:39 +04:00
sql_analyze_stmt.cc Fixed compile warnings on Solaris 2015-11-20 10:00:06 +02:00
sql_analyze_stmt.h MDEV-8981: Analyze stmt - cycles can overflow 2015-10-24 11:45:21 +11:00
sql_array.h - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
sql_audit.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
sql_audit.h Merge with 10.0-base 2014-03-13 16:43:11 +02:00
sql_base.cc MDEV-9621 INSERT DELAYED fails on insert for tables with many columns 2016-04-07 19:31:10 +03:00
sql_base.h MDEV-9621 INSERT DELAYED fails on insert for tables with many columns 2016-04-07 19:31:10 +03:00
sql_binlog.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
sql_binlog.h
sql_bitmap.h MDEV-9021: MYSQLD SEGFAULTS WHEN BUILT USING --WITH-MAX-INDEXES=128 2015-11-09 09:28:00 -05:00
sql_bootstrap.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
sql_bootstrap.h
sql_builtin.cc.in Push forgotten file change to fix compiler errors. 2015-02-19 12:41:10 +02:00
sql_cache.cc Merge branch '10.0-galera' into bb-10.1-serg 2016-02-24 01:21:40 -05:00
sql_cache.h MDEV-6152: Remove calls to current_thd while creating Item 2015-09-01 18:42:02 +03:00
sql_callback.h
sql_class.cc Fix to ensure updates in gtid_slave_state table do not get binlogged. 2016-02-24 23:32:37 -05:00
sql_class.h Merge branch '10.0-galera' into 10.1 2016-03-22 01:35:56 -04:00
sql_client.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
sql_cmd.h small cleanup 2015-06-27 09:40:56 +02:00
sql_connect.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
sql_connect.h
sql_const.h Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
sql_crypt.cc MDEV-5120 Test suite test maria-no-logging fails 2014-09-30 20:31:14 +03:00
sql_crypt.h Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
sql_cursor.cc Merge branch '10.0' into 10.1 2015-09-03 12:58:41 +02:00
sql_cursor.h
sql_db.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-08-27 22:29:11 +03:00
sql_db.h MDEV-7280 DATABASE: CREATE OR REPLACE 2014-12-10 08:13:08 +04:00
sql_delete.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
sql_delete.h MWL#205 DELETE with result set (mdev-3814) 2013-08-06 13:31:38 -07:00
sql_derived.cc MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) 2015-08-21 10:40:39 +04:00
sql_derived.h MDEV-6668: Server crashes in check_view_single_update on concurrent DDL/DML flow with views and triggers 2015-01-29 15:12:32 +02:00
sql_digest.cc Merge branch '10.0' into 10.1 2015-09-03 12:58:41 +02:00
sql_digest.h merge commit 02b00b154 2015-10-24 20:06:59 +02:00
sql_digest_stream.h perfschema 5.6.24 2015-05-05 15:23:47 +02:00
sql_do.cc MDEV-8806 Numeric CAST produce different warnings for strings literals vs functions 2015-09-25 21:33:50 +04:00
sql_do.h
sql_error.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
sql_error.h Adding "const" qualifier to arguments of date2my_decimal() 2015-10-22 09:11:23 +04:00
sql_explain.cc Fixed compile warnings on Solaris 2015-11-20 10:00:06 +02:00
sql_explain.h MDEV-8829: Assertion `0' failed in Explain_table_access::tag_to_json 2015-09-24 15:45:54 +03:00
sql_expression_cache.cc Stage 2 of MDEV-6152: 2015-08-21 10:40:51 +04:00
sql_expression_cache.h MDEV-7811: EXPLAIN/ANALYZE FORMAT=JSON should show subquery cache 2015-07-01 20:03:29 +03:00
sql_get_diagnostics.cc Stage 2 of MDEV-6152: 2015-08-21 10:40:51 +04:00
sql_get_diagnostics.h Applied all changes from Igor and Sanja 2013-06-15 18:32:08 +03:00
sql_handler.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
sql_handler.h Merge remote-tracking branch 'mysql/5.5' into 5.5 2015-10-08 22:54:24 +02:00
sql_help.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-08-27 22:21:08 +03:00
sql_help.h
sql_hset.h find() method for Hash_set<>. 2013-10-18 12:36:03 -07:00
sql_insert.cc MDEV-9621 INSERT DELAYED fails on insert for tables with many columns 2016-04-07 19:31:10 +03: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 Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_join_cache.h MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes) 2014-10-11 18:53:06 +02:00
sql_lex.cc MDEV-9701: CREATE VIEW with GROUP BY or ORDER BY and constant produces invalid definition 2016-03-18 19:22:13 +01:00
sql_lex.h Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_lifo_buffer.h 5.3 merge 2014-02-22 22:51:20 +01:00
sql_list.cc
sql_list.h - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
sql_load.cc MDEV-8605 MariaDB not use DEFAULT value even when inserted NULL for NOT NULLABLE column 2015-12-21 21:30:54 +01:00
sql_load.h
sql_locale.cc Fix spelling errors 2015-08-27 00:39:44 +03:00
sql_locale.h
sql_manager.cc remove unneded #include's that had a dubious explanation 2015-10-24 19:58:34 +02:00
sql_manager.h
sql_parse.cc MDEV-9621 INSERT DELAYED fails on insert for tables with many columns 2016-04-07 19:31:10 +03:00
sql_parse.h Fix for test failures. 2016-02-23 20:33:21 -05:00
sql_partition.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
sql_partition.h clang warning 2015-09-03 12:58:53 +02:00
sql_partition_admin.cc Merge branch 'github/10.0-galera' into 10.1 2015-11-19 17:48:36 +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 Merge tag 'mariadb-10.0.24' into 10.0-galera 2016-02-23 20:53:29 -05:00
sql_plugin.h Push for testing of encryption 2015-02-10 10:21:17 +01:00
sql_plugin_compat.h
sql_plugin_services.ic Fix to ensure updates in gtid_slave_state table do not get binlogged. 2016-02-24 23:32:37 -05:00
sql_prepare.cc MDEV-9443: Add REVOKE <role> as a command to PREPARE 2016-03-22 22:21:04 +02:00
sql_prepare.h MDEV-5314 - Compiling fails on OSX using clang 2014-02-19 14:05:15 +04:00
sql_priv.h compiler warning 2015-07-20 19:47:46 +02:00
sql_profile.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
sql_profile.h MDEV-7999 - PROFILING routines take 0.2% when profiling disabled 2015-05-13 10:43:13 +04:00
sql_reload.cc Merge tag 'mariadb-10.0.24' into 10.0-galera 2016-02-23 20:53:29 -05:00
sql_reload.h MySQL WL#5522 - InnoDB transportable tablespaces. 2014-02-02 10:06:29 +01:00
sql_rename.cc Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
sql_rename.h
sql_repl.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_repl.h MDEV-5273 Prepared statement doesn't return metadata after prepare. 2016-01-28 11:12:03 +04:00
sql_select.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_select.h Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_servers.cc MDEV-9088 Server crashes on shutdown after the second post of feedback report 2015-12-19 13:36:21 +01:00
sql_servers.h cleanup: freshen up CREATE SERVER code 2014-12-04 10:41:51 +01:00
sql_show.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_show.h Merge tag 'mariadb-10.0.24' into 10.0-galera 2016-02-23 20:53:29 -05:00
sql_signal.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-09-01 18:42:02 +03: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 Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
sql_statistics.h MDEV-6442: Assertion `join->best_read < double(...)' failed with optimizer_use_condition_selectivity >=3 2014-10-06 15:29:22 +04:00
sql_string.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_string.h MDEV-8253 EXPLAIN SELECT prints unexpected characters 2015-09-23 13:04:28 +04:00
sql_table.cc Merge tag 'mariadb-10.0.24' into 10.0-galera 2016-02-23 20:53:29 -05:00
sql_table.h MDEV-8831 : enforce_storage_engine doesn't block table creation on other nodes 2015-10-01 20:36:25 -04:00
sql_tablespace.cc - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
sql_tablespace.h
sql_test.cc Merge branch '10.0' into 10.1 2015-09-03 12:58:41 +02:00
sql_test.h
sql_time.cc Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
sql_time.h Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
sql_trigger.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_trigger.h MDEV-8605 MariaDB not use DEFAULT value even when inserted NULL for NOT NULLABLE column 2015-12-21 21:30:54 +01:00
sql_truncate.cc Merge tag 'mariadb-10.0.19' into 10.1 2015-06-01 15:51:25 +02:00
sql_truncate.h 5.5.38 merge 2014-06-06 00:07:27 +02:00
sql_type.cc MDEV-8912 Wrong metadata or type for @c:=string_or_blob_field 2015-10-07 20:19:29 +04:00
sql_type.h Fixed compiler warnings and errors 2015-10-09 13:01:07 +03:00
sql_udf.cc Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
sql_udf.h Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
sql_union.cc MDEV-9701: CREATE VIEW with GROUP BY or ORDER BY and constant produces invalid definition 2016-03-18 19:22:13 +01:00
sql_union.h
sql_update.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_update.h MDEV-8701 Crash on derived query 2015-11-06 17:56:56 +01:00
sql_view.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
sql_view.h Merge tag 'mariadb-10.0.19' into 10.1 2015-06-01 15:51:25 +02:00
sql_yacc.yy Merge tag 'mariadb-10.0.24' into 10.0-galera 2016-02-23 20:53:29 -05: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 cleanup: LEX_USER::pwtext and LEX_USER::pwhash 2016-01-25 17:04:15 +01:00
sys_vars.cc MDEV-6058 MySQL Bug #11766693: LOG-SLOW-ADMIN-STATEMENTS AND 2016-03-22 23:26:39 +04:00
sys_vars.ic cleanup 2016-02-23 10:46:16 +01:00
sys_vars_shared.h
table.cc Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
table.h MDEV-9621 INSERT DELAYED fails on insert for tables with many columns 2016-04-07 19:31:10 +03:00
table_cache.cc Replaced lf-hash element_size hack with initializer function. 2015-03-04 13:34:53 +04:00
table_cache.h - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
thr_malloc.cc - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
thr_malloc.h
threadpool.h Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
threadpool_common.cc MDEV-9156 : Fix tp_add_connection()'s error handling 2015-12-04 18:16:04 +01:00
threadpool_unix.cc MDEV-9156 : Fix tp_add_connection()'s error handling 2015-12-04 18:16:04 +01:00
threadpool_win.cc Fix spelling: occurred, execute, which etc 2016-03-04 02:09:37 +02:00
transaction.cc - Renaming variables so that they don't shadow others (After this patch one can compile with -Wshadow and get much fewer warnings) 2015-07-06 20:24:14 +03:00
transaction.h Updated/added copyright headers 2014-01-06 10:52:35 +05:30
tzfile.h
tztime.cc Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
tztime.h
udf_example.c Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42 2015-02-11 23:50:40 +01:00
udf_example.def
uniques.cc misc IO_CACHE cleanups 2015-06-02 18:53:37 +02:00
unireg.cc MDEV-6152: Remove calls to current_thd while creating Item 2015-09-01 18:42:02 +03:00
unireg.h Merge branch '10.0' into 10.1 2015-10-12 00:37:58 +02:00
winservice.c
winservice.h CRLF->LF 2015-06-02 22:07:47 +02:00
wsrep_applier.cc Merge branch '10.0-galera' into bb-10.1-serg 2016-02-24 01:21:40 -05:00
wsrep_applier.h Merge branch '10.0-galera' into 10.1 2015-07-14 16:05:29 -04:00
wsrep_binlog.cc cleanup: Log_event::write() and MYSQL_BIN_LOG::write_cache() 2015-09-04 10:33:55 +02:00
wsrep_binlog.h MDEV-7867: Add binlog header to GRA_.log file 2015-04-01 18:25:40 -04:00
wsrep_check_opts.cc MDEV-9577: sys_vars.ignore_db_dirs_basic fails under Valgrind 2016-02-17 15:50:01 -05:00
wsrep_dummy.cc Fix to ensure updates in gtid_slave_state table do not get binlogged. 2016-02-24 23:32:37 -05:00
wsrep_hton.cc Merge branch '10.0-galera' into bb-10.1-serg 2016-02-24 01:21:40 -05:00
wsrep_mysqld.cc Fix to ensure updates in gtid_slave_state table do not get binlogged. 2016-02-24 23:32:37 -05:00
wsrep_mysqld.h Merge branch '10.0-galera' into bb-10.1-serg 2016-02-24 01:21:40 -05:00
wsrep_notify.cc Refs codership/mysql-wsrep#141: this commit 2015-09-09 17:02:26 -04:00
wsrep_priv.h Merge branch '10.0-galera' into 10.1 2015-07-14 16:05:29 -04:00
wsrep_sst.cc Merge branch 'bb-10.1-serg' into 10.1 2016-03-22 19:18:48 +01:00
wsrep_sst.h LP1378355 - Pass the value of --defaults-group-suffix to xtrabackup during SST 2015-05-08 17:41:05 -04:00
wsrep_thd.cc MDEV-8208 Sporadic SEGFAULT on startup 2016-01-25 17:04:09 +01:00
wsrep_thd.h Improve performance for calculating memory allocation 2015-02-01 15:24:22 +02:00
wsrep_utils.cc Merge branch 'github/10.0-galera' into 10.1 2015-11-19 17:48:36 +01:00
wsrep_utils.h Merge branch 'github/10.0-galera' into 10.1 2015-11-19 17:48:36 +01:00
wsrep_var.cc refs codership/galera#308 2016-02-22 16:45:34 -05:00
wsrep_var.h Improve performance for calculating memory allocation 2015-02-01 15:24:22 +02:00
wsrep_xid.cc Merge branch '10.0-galera' into 10.1 2015-07-14 16:05:29 -04:00
wsrep_xid.h compilation failures on Windows 2015-07-23 10:55:24 +02:00