1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
MariaDB-server/sql
History
Jan Lindström 648cf7176c Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
..
examples
…
share
Merge remote-tracking branch '5.5' into 10.0
2017-12-20 12:51:57 +02: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
Merge tag 'mariadb-10.0.34' into 10.0-galera
2018-02-01 14:09:48 +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
2018-01-24 12:11:29 +04:00
create_options.cc
MDEV-5867 ALTER TABLE t1 ENGINE=InnoDB keeps bad options when t1 ENGINE is CONNECT
2014-07-08 19:39:27 +02: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
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03: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
bugfix: DEBUG_SYNC() invoked with no THD
2017-02-27 12:35:10 +01:00
debug_sync.h
Fixed failing test cases and compiler warnings
2016-04-25 15:37:24 +03:00
derror.cc
Fixed compiler error and some warnings on windows
2016-08-23 15:03:31 +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
MDEV-6262 analyze the coverity report on mariadb
2017-05-19 20:26:56 +02:00
discover.h
10.0-monty merge
2013-07-21 16:39:19 +02:00
event_data_objects.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
event_data_objects.h
5.1 merge
2014-03-16 13:59:44 +01:00
event_db_repository.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
event_db_repository.h
5.1 merge
2014-03-16 13:59:44 +01:00
event_parse_data.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03:00
event_parse_data.h
…
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-11221 - main.events_restart failed in bb
2017-03-01 11:35:24 +04:00
event_scheduler.h
10.0-base merge
2014-02-26 15:28:07 +01:00
events.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
events.h
Allow mysql_upgrade to enable event after table is corrected
2015-10-21 16:31:11 +03:00
field_conv.cc
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
field.cc
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
field.h
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
filesort_utils.cc
Merge remote-tracking branch '5.5' into 10.0
2017-12-20 12:51:57 +02:00
filesort_utils.h
MDEV-5173 Cppcheck report
2014-03-19 09:58:06 +01:00
filesort.cc
Merge remote-tracking branch '5.5' into 10.0
2017-12-20 12:51:57 +02:00
filesort.h
…
gcalc_slicescan.cc
compilation errors on sparc sun studio 10
2016-02-15 12:51:35 +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
compilation errors on sparc sun studio 10
2016-02-15 12:51:35 +01:00
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
Merge branch 'merge-perfschema-5.6' into 10.0
2015-08-03 16:34:59 +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_ndbcluster_binlog.cc
Fix spelling: occurred, execute, which etc
2016-03-04 02:09:37 +02: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
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03: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_ndbcluster.cc
Fix spelling: occurred, execute, which etc
2016-03-04 02:09:37 +02:00
ha_ndbcluster.h
5.2 merge
2014-03-16 21:03:01 +01:00
ha_partition.cc
Merge tag 'mariadb-10.0.33' into bb-10.0-galera
2017-11-03 12:34:05 +05:30
ha_partition.h
Added test for MDEV#4953.
2014-05-21 11:59:33 -04:00
handler.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
handler.h
Merge tag 'mariadb-10.0.34' into 10.0-galera
2018-02-01 14:09:48 +02: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
remove unneded #include's that had a dubious explanation
2015-10-24 19:58:34 +02: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
Percona-Server-5.6.14-rel62.0 merge
2013-12-22 17:06:50 +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
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
item_cmpfunc.h
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
item_create.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +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 tag 'mariadb-5.5.60' into 5.5-galera
2018-04-24 13:34:57 +03:00
item_func.h
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
item_geofunc.cc
MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery
2017-06-19 12:45:32 +04:00
item_geofunc.h
MDEV-10306 Wrong results with combination of CONCAT, SUBSTR and CONVERT in subquery
2017-06-19 12:45:32 +04:00
item_inetfunc.cc
MDEV-14116 INET6_NTOA output is set as null to varchar(39) variable
2017-11-07 21:57:42 +04:00
item_inetfunc.h
MDEV-14116 INET6_NTOA output is set as null to varchar(39) variable
2017-11-07 21:57:42 +04:00
item_row.cc
MDEV-14164: Unknown column error when adding aggregate to function in oracle style procedure FOR loop
2017-11-09 09:31:03 +01:00
item_row.h
MDEV-14164: Unknown column error when adding aggregate to function in oracle style procedure FOR loop
2017-11-09 09:31:03 +01:00
item_strfunc.cc
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
item_strfunc.h
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
item_subselect.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
item_subselect.h
MDEV-14164: Unknown column error when adding aggregate to function in oracle style procedure FOR loop
2017-11-09 09:31:03 +01:00
item_sum.cc
Merge remote-tracking branch '5.5' into 10.0
2017-12-20 12:51:57 +02:00
item_sum.h
Merge remote-tracking branch 'origin/5.5' into 10.0
2017-05-17 15:42:36 +03:00
item_timefunc.cc
Merge branch '5.5' into 10.0
2017-10-18 15:14:39 +02:00
item_timefunc.h
Merge branch '5.5' into 10.0
2017-10-18 15:14:39 +02:00
item_xmlfunc.cc
Merge branch '5.5' into 10.0
2017-04-21 18:34:06 +02:00
item_xmlfunc.h
A joint patch for:
2014-03-23 15:15:07 +04:00
item.cc
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
item.h
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
key.cc
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
key.h
10.0-base merge
2014-02-26 15:28:07 +01:00
keycaches.cc
MDEV-7123 : MariaDB 10.0.14 Galera node shutdown with signal 11
2015-01-09 00:32:28 -05:00
keycaches.h
Fixed compiler warnings and a not critical memory leak
2013-04-17 22:33:33 +03:00
lex_symbol.h
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
lex.h
Merge branch '5.5' into bb-10.0
2016-06-21 14:11:02 +02:00
lock.cc
Merge tag 'mariadb-10.0.32' into 10.0-galera
2017-08-09 08:56:11 +03:00
lock.h
…
log_event_old.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
log_event_old.h
5.2 merge
2014-03-16 21:03:01 +01:00
log_event.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
log_event.h
MDEV-4487 Allow replication from MySQL 5.6+ when GTID is enabled on the master
2015-10-08 10:45:09 +03:00
log_slow.h
Merge 5.5 into 10.0
2017-03-08 11:40:43 +02:00
log.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
log.h
Bug#24388753: PRIVILEGE ESCALATION USING MYSQLD_SAFE
2016-08-25 13:42:17 +05:30
main.cc
…
mdl.cc
Cleanup: MDL_context::wsrep_get_thd() is no longer needed
2016-09-01 12:53:44 -04:00
mdl.h
Cleanup: MDL_context::wsrep_get_thd() is no longer needed
2016-09-01 12:53:44 -04: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
MSG00001.bin
…
multi_range_read.cc
MDEV-12972 Random and Frequent Segfault
2017-08-03 19:28:05 +03:00
multi_range_read.h
Merge
2014-10-29 15:20:46 +03:00
my_apc.cc
Fix spelling: occurred, execute, which etc
2016-03-04 02:09:37 +02: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
Windows : Fix server compile errors when compile with /Zc:strictStrings option
2017-02-28 12:57:33 +00:00
mysql_upgrade_service.cc
…
mysqld_suffix.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
mysqld.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
mysqld.h
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
net_serv.cc
Merge remote-tracking branch 'origin/5.5' into 10.0
2017-07-25 00:41:54 +03:00
nt_servc.cc
Windows : Fix server compile errors when compile with /Zc:strictStrings option
2017-02-28 12:57:33 +00:00
nt_servc.h
Windows : Fix server compile errors when compile with /Zc:strictStrings option
2017-02-28 12:57:33 +00:00
opt_index_cond_pushdown.cc
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_range.cc
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
opt_range.h
5.5.39 merge
2014-08-07 18:06:56 +02:00
opt_subselect.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
opt_subselect.h
MDEV-8289: Semijoin inflates number of rows in query result
2015-08-18 22:54:42 +03:00
opt_sum.cc
MDEV-13459 Warnings, when compiling with gcc-7.x
2017-10-17 07:37:39 +02:00
opt_table_elimination.cc
MDEV-6978 Bad results with join comparing case insensitive VARCHAR/ENUM/SET
2014-11-19 10:33:49 +04:00
parse_file.cc
MDEV-8045 Assertion `0' fails in Protocol::end_statement on CREATE VIEW after another connection aborted
2015-05-03 18:26:02 +02:00
parse_file.h
MDEV-10725 Server 10.1.17 fails to build using clang with c++11
2016-09-26 12:20:28 +02:00
partition_element.h
mysql-5.1.73 merge
2014-03-15 18:24:15 +01:00
partition_info.cc
Merge remote-tracking branch '5.5' into 10.0
2017-12-20 12:51:57 +02:00
partition_info.h
Merge remote-tracking branch '5.5' into 10.0
2017-12-20 12:51:57 +02: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
5.2 merge
2014-03-16 21:03:01 +01:00
protocol.cc
Merge branch '10.0' into 10.0-galera
2016-08-24 19:30:32 -04:00
protocol.h
5.5 merge
2014-05-09 12:35:11 +02:00
records.cc
Merge remote-tracking branch 'origin/5.5' into 10.0
2017-07-25 00:41:54 +03:00
records.h
Fixed MDEV-8408
2015-10-23 18:49:02 +03:00
repl_failsafe.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03:00
repl_failsafe.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
replication.h
5.5.39 merge
2014-08-07 18:06:56 +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
Merge branch '5.5' into 10.0
2016-12-09 16:33:48 +01:00
rpl_filter.h
5.1 merge
2014-03-16 13:59:44 +01:00
rpl_gtid.cc
Merge tag 'mariadb-10.0.23' into 10.0-galera
2015-12-19 14:24:38 -05:00
rpl_gtid.h
Fixes to get all test to run on MacosX Lion 10.7
2015-11-29 17:51:23 +02:00
rpl_handler.cc
Merge remote-tracking branch 'origin/5.5' into 10.0
2017-07-25 00:41:54 +03:00
rpl_handler.h
5.5.39 merge
2014-08-07 18:06:56 +02:00
rpl_injector.cc
remove unneded #include's that had a dubious explanation
2015-10-24 19:58:34 +02:00
rpl_injector.h
mysql-5.1.73 merge
2014-03-15 18:24:15 +01:00
rpl_mi.cc
Merge tag 'mariadb-10.0.32' into 10.0-galera
2017-08-09 08:56:11 +03:00
rpl_mi.h
Added a separate lock for start/stop/reset slave.
2017-02-28 16:10:46 +01:00
rpl_parallel.cc
MDEV-11201: gtid_ignore_duplicates incorrectly ignores statements when GTID replication is not enabled
2017-04-10 07:53:27 +02:00
rpl_parallel.h
MDEV-9573 'Stop slave' hangs on replication slave
2017-02-28 16:10:46 +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_record.cc
MDEV-11636 Extra persistent columns on slave always gets NULL in RBR
2017-01-01 16:45:44 +05:30
rpl_record.h
MDEV-11636 Extra persistent columns on slave always gets NULL in RBR
2017-01-01 16:45:44 +05:30
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
Fix purge_relay_logs post merge
2017-07-27 16:22:37 +03:00
rpl_rli.h
Merge remote-tracking branch 'origin/5.5' into 10.0
2017-07-25 00:41:54 +03:00
rpl_tblmap.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03:00
rpl_tblmap.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
rpl_utility.cc
Merge commit '96badb16afcf' into 10.0
2015-08-03 23:09:43 +03: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
bzr merge -rtag:mariadb-10.0.15 maria/10.0
2014-12-05 12:33:02 -05:00
set_var.h
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
sha2.cc
…
signal_handler.cc
Merge remote-tracking branch 'origin/5.5' into 10.0
2017-01-06 17:09:59 +02:00
slave.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
slave.h
Added a separate lock for start/stop/reset slave.
2017-02-28 16:10:46 +01: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
Merge branch '5.5' into 10.0
2017-10-18 15:14:39 +02:00
sp_head.h
Fix spelling: occurred, execute, which etc
2016-03-04 02:09:37 +02:00
sp_pcontext.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03: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
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03:00
sp_rcontext.h
5.1 merge
2014-03-16 13:59:44 +01:00
sp.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sp.h
Fix for bug#11759114 - '51401: GRANT TREATS NONEXISTENT
2017-02-27 12:35:10 +01:00
spatial.cc
MDEV-12915 ST_Centroid does not return the same result than MySQL.
2017-08-01 09:52:56 +02:00
spatial.h
5.2 merge
2014-03-16 21:03:01 +01:00
sql_acl.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_acl.h
MDEV-13676: Field "create Procedure" is NULL, even if the the user has role which is the definer. (SHOW CREATE PROCEDURE)
2017-10-11 12:15:52 +03:00
sql_admin.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03: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
BUG#27160888: MISSING FILE PRIVILEDGE CHECKS ON SOME
2018-01-11 19:48:12 +05:30
sql_alter.h
MDEV-6390 CONVERT TO CHARACTER SET utf8 doesn't change DEFAULT CHARSET.
2017-02-26 23:01:23 +04:00
sql_analyse.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03: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
MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warning
2017-05-15 22:23:10 +02:00
sql_audit.h
Merge with 10.0-base
2014-03-13 16:43:11 +02:00
sql_base.cc
BUG#27216817: INNODB: FAILING ASSERTION:
2018-02-26 14:37:39 +05:30
sql_base.h
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +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
5.2 merge
2014-03-16 21:03:01 +01: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
Initial merge result with mariaDB 10: lp:maria
2013-07-13 13:01:13 +03:00
sql_cache.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_cache.h
MDEV-4786 merge 10.0-monty -> 10.0
2013-08-12 14:17:51 +02:00
sql_callback.h
…
sql_class.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_class.h
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_client.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03:00
sql_cmd.h
10.0-base merge (roles)
2013-10-29 15:08:44 +01:00
sql_connect.cc
Merge tag 'mariadb-10.0.29' into 10.0-galera
2017-01-13 13:53:59 -05:00
sql_connect.h
…
sql_const.h
Merge branch '5.5' into 10.0
2017-10-18 15:14:39 +02: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 remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
sql_cursor.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_db.cc
MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_key’" when -DWITHOUT_SERVER=1
2017-04-20 16:36:23 +02:00
sql_db.h
s/st_ha_create_information/HA_CREATE_INFO/
2013-04-07 15:35:39 +02:00
sql_delete.cc
Merge tag 'mariadb-10.0.33' into bb-10.0-galera
2017-11-03 12:34:05 +05:30
sql_delete.h
MWL#205 DELETE with result set (mdev-3814)
2013-08-06 13:31:38 -07:00
sql_derived.cc
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02: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_stream.h
perfschema 5.6.24
2015-05-05 15:23:47 +02:00
sql_digest.cc
Silence bogus GCC 7 warnings -Wimplicit-fallthrough
2017-05-17 08:07:02 +03:00
sql_digest.h
merge commit 02b00b154
2015-10-24 20:06:59 +02:00
sql_do.cc
Merge branch '5.5' into 10.0
2017-10-18 15:14:39 +02:00
sql_do.h
…
sql_error.cc
Allow mysql_upgrade to enable event after table is corrected
2015-10-21 16:31:11 +03:00
sql_error.h
5.5.38 merge
2014-06-06 00:07:27 +02:00
sql_explain.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03:00
sql_explain.h
Better comments
2013-10-17 17:50:30 +04:00
sql_expression_cache.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03:00
sql_expression_cache.h
…
sql_get_diagnostics.cc
MDEV-6661 PI() does not work well in UCS2/UTF16/UTF32 context
2014-09-01 20:57:32 +04:00
sql_get_diagnostics.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_handler.cc
remove unneded #include's that had a dubious explanation
2015-10-24 19:58:34 +02: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-9524 Cannot load from mysql.event when sql_mode is set to PAD_CHAR_TO_FULL_LENGTH
2016-06-21 21:26:31 +04:00
sql_help.h
…
sql_hset.h
find() method for Hash_set<>.
2013-10-18 12:36:03 -07:00
sql_insert.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +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 remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
sql_join_cache.h
Fixed bug mdev-6071.
2014-06-10 10:34:58 -07:00
sql_lex.cc
Merge tag 'mariadb-10.0.34' into 10.0-galera
2018-02-01 14:09:48 +02:00
sql_lex.h
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
sql_lifo_buffer.h
Correct TRASH() macro usage
2018-01-22 11:39:54 +01:00
sql_list.cc
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_list.h
Correct TRASH() macro usage
2018-01-22 11:39:54 +01:00
sql_load.cc
Merge branch '5.5' into 10.0
2017-10-18 15:14:39 +02:00
sql_load.h
…
sql_locale.cc
Merge branch '5.5' into 10.0
2016-04-26 23:05:26 +02:00
sql_locale.h
MDEV-10052 Illegal mix of collations with DAYNAME(date_field)<>varchar_field
2016-05-10 19:13:06 +04:00
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
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_parse.h
MW-86 Additional wsrep_sync_wait coverage
2017-08-14 11:59:52 +03:00
sql_partition_admin.cc
Refs: MW-360 * reverted WSREP_TO_ISOLATION macros back to original form
2017-08-11 14:06:16 +03:00
sql_partition_admin.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_partition.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_partition.h
Merge branch '5.5' into 10.0
2017-10-18 15:14:39 +02:00
sql_plist.h
merge 10-base->10.0
2013-11-11 23:40:53 +02: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_plugin.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_plugin.h
Merge branch '5.5' into 10.0
2016-08-10 19:19:05 +02:00
sql_prepare.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_prepare.h
MDEV-5314 - Compiling fails on OSX using clang
2014-02-19 14:05:15 +04:00
sql_priv.h
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_profile.cc
remove unneded #include's that had a dubious explanation
2015-10-24 19:58:34 +02:00
sql_profile.h
mysql-5.1.73 merge
2014-03-15 18:24:15 +01:00
sql_reload.cc
Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge
2017-03-17 02:05:20 +05:30
sql_reload.h
MySQL WL#5522 - InnoDB transportable tablespaces.
2014-02-02 10:06:29 +01:00
sql_rename.cc
MDEV-8569 build_table_filename() doesn't support temporary tables.
2016-07-18 11:50:08 +04:00
sql_rename.h
test_sql_discovery storage engine
2013-04-09 16:07:35 +02:00
sql_repl.cc
Merge tag 'mariadb-5.5.58' into 5.5-galera
2017-10-19 09:06:17 +03:00
sql_repl.h
Merge MariaDB 10.0-base to 10.0.
2014-02-10 15:12:17 +01:00
sql_select.cc
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
sql_select.h
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02: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
…
sql_show.cc
Merge tag 'mariadb-5.5.60' into 5.5-galera
2018-04-24 13:34:57 +03: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
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +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
Fixed bug mdev-11096.
2016-10-26 20:45:35 -07:00
sql_statistics.h
Fixed bug mdev-11096.
2016-10-26 20:45:35 -07:00
sql_string.cc
Fix spelling: occurred, execute, which etc
2016-03-04 02:09:37 +02:00
sql_string.h
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
sql_table.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_table.h
MDEV-8569 build_table_filename() doesn't support temporary tables.
2016-07-18 11:50:08 +04:00
sql_tablespace.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03:00
sql_tablespace.h
…
sql_test.cc
Merge commit '96badb16afcf' into 10.0
2015-08-03 23:09:43 +03:00
sql_test.h
…
sql_time.cc
MDEV-10524 Assertion `arg1_int >= 0' failed in Item_func_additive_op::result_precision()
2016-12-19 14:28:08 +04:00
sql_time.h
MDEV-10524 Assertion `arg1_int >= 0' failed in Item_func_additive_op::result_precision()
2016-12-19 14:28:08 +04:00
sql_trigger.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_trigger.h
remove unneded #include's that had a dubious explanation
2015-10-24 19:58:34 +02:00
sql_truncate.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_truncate.h
5.5.38 merge
2014-06-06 00:07:27 +02:00
sql_udf.cc
Merge remote-tracking branch 'origin/5.5' into 10.0
2017-01-06 17:09:59 +02:00
sql_udf.h
Merge branch '5.5' into 10.0
2015-12-13 00:10:40 +01:00
sql_union.cc
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
sql_union.h
…
sql_update.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_update.h
MDEV-8701 Crash on derived query
2015-11-06 17:56:56 +01:00
sql_view.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sql_view.h
Merge branch '5.5' into 10.0
2015-05-04 22:00:24 +02:00
sql_yacc.yy
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03: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
MDEV-13655: Set role does not properly grant privileges.
2017-12-19 12:33:25 +02:00
sys_vars_shared.h
…
sys_vars.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
sys_vars.h
Merge branch '5.5' into 10.0
2017-01-12 03:37:13 +02:00
table_cache.cc
MDEV-10315 - Online ALTER TABLE may get stuck in tdc_remove_table
2016-09-22 10:21:12 +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
table.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
table.h
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
thr_malloc.cc
MDEV-5120 Test suite test maria-no-logging fails
2014-09-30 20:31:14 +03:00
thr_malloc.h
…
threadpool_common.cc
MDEV-11083 performance schema test fail with threadpool
2016-10-19 00:21:28 +02:00
threadpool_unix.cc
Merge branch '5.5' into 10.0
2017-07-06 23:47:33 +02:00
threadpool_win.cc
Fix spelling: occurred, execute, which etc
2016-03-04 02:09:37 +02:00
threadpool.h
MDEV-9156 : Fix tp_add_connection()'s error handling
2015-12-04 18:16:04 +01:00
transaction.cc
Merge tag 'mariadb-10.0.34' into 10.0-galera
2018-02-01 14:09:48 +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
Merge branch '10.0' into 10.0-galera
2016-04-29 16:50:58 -04: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
Fix merge error
2017-09-19 02:05:11 +03:00
unireg.cc
Merge remote-tracking branch '5.5' into 10.0
2018-01-24 12:29:31 +02:00
unireg.h
MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()
2015-09-06 22:26:33 +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
CRLF->LF
2015-06-02 22:07:47 +02:00
wsrep_applier.cc
Fix test failure on test MW-86 and remove MW-360 test.
2017-08-15 13:57:15 +03:00
wsrep_applier.h
Refs codership/mysql-wsrep#33
2015-05-08 17:41:06 -04:00
wsrep_binlog.cc
fix warning "ignoring return value" of fwrite.
2017-04-05 14:37:11 +03:00
wsrep_binlog.h
MW-267 Enforce wsrep_max_ws_size limit in wsrep provider
2016-07-25 11:44:57 -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_hton.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
wsrep_mysqld.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
wsrep_mysqld.h
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
wsrep_notify.cc
Refs codership/mysql-wsrep#141: this commit
2015-09-09 17:02:26 -04:00
wsrep_priv.h
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
wsrep_sst.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
wsrep_sst.h
Backport 4bb49d84a9df, correct handling on defaults[-extra]-file is SST scripts
2018-01-14 22:48:02 +11:00
wsrep_thd.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
wsrep_thd.h
MDEV-6602: rpl.rpl_mdev6020 fails sporadically with SIGABRT
2014-08-25 09:13:15 +03:00
wsrep_utils.cc
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
2018-05-07 13:49:14 +03:00
wsrep_utils.h
MW-366 Improved support for IPv6 networks - made mysqld and SST scripts to recognize []-escaped IPv6 addresses - pulled in latest Percona and MariaDB updates to SST scripts - instruct netcat and socat in wsrep_sst_xtrabackup-v2 to listen on IPv6 socket via sockopt parameter in the [sst] section of my.cnf
2017-08-11 15:00:18 +03:00
wsrep_var.cc
MW-399 Freeing wsrep_status_vars, before provider is released.
2017-11-08 14:20:30 +02:00
wsrep_var.h
MW-267 Enforce wsrep_max_ws_size limit in wsrep provider
2016-07-25 11:44:57 -04:00
wsrep_xid.cc
Refs codership/mysql-wsrep#33
2015-05-08 17:41:06 -04:00
wsrep_xid.h
Refs codership/mysql-wsrep#33
2015-05-08 17:41:06 -04:00