database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
Files
7dd74fa3a2f167424624bf71d54ff965514239a9
mariadb/sql
History
Nirbhay Choubey 7dd74fa3a2 MDEV-6481: Yum Upgrade on CentOS 6.5 causes instant 
crash of MariaDB/Galera

mysqld crashes during startup when its started with --wsrep-recover
(mysqld_safe.sh). The problem was that during server startup "wsrep"
handle is not initialized for --wsrep-recover and since the condition
to register wsrep hton depended only on 'wsrep_on' global/session
variables (WSREP(thd) macro), it can eventually get registered and
calls to wsrep handle's functions (commit, rollback, etc.) can be
made (SIGSEGV!).

Fixed by adding a check for "wsrep" pointer in WSREP(thd) macro
(added by lp:1367173). Additionally, a check for WSREP(thd)
(instead of checking the availability of wsrep provider) has been
added before invoking wsrep handle's commit & rollback functions.
2014-10-08 13:30:45 -04:00
..
examples
…
share
MDEV-6224 Incorrect information in file when *.frm is > 256K
2014-07-08 19:38:26 +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
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -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
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
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
…
des_key_file.cc
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
des_key_file.h
…
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
bzr merge -r4101..4103 codership/5.6/
2014-08-12 12:43:56 -04: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
Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS,
2014-05-08 18:13:01 +05:30
event_scheduler.h
10.0-base merge
2014-02-26 15:28:07 +01:00
events.cc
bzr merge -r4091..4101 codership/5.6/
2014-06-19 18:48:20 -04:00
events.h
5.1 merge
2014-03-16 13:59:44 +01:00
field_conv.cc
5.2 merge
2014-03-16 21:03:01 +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
5.5.39 merge
2014-08-07 18:06:56 +02: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
filesort.cc
5.5.39 merge
2014-08-07 18:06:56 +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
gcalc_slicescan.cc
bug #977021 ST_BUFFER fails with the negative D.
2012-04-29 18:08:11 +05:00
gcalc_slicescan.h
…
gcalc_tools.cc
5.3 merge
2012-01-13 15:50:02 +01:00
gcalc_tools.h
…
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_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_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_partition.cc
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
ha_partition.h
Added test for MDEV#4953.
2014-05-21 11:59:33 -04:00
handler.cc
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
handler.h
bzr merge -rtag:mariadb-10.0.12 maria/10.0
2014-06-19 13:12:38 -04: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
…
innodb_priv.h
Percona-Server-5.6.14-rel62.0 merge
2013-12-22 17:06:50 +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
Creating a new class in_string::Item_string_for_in_vector
2014-09-04 12:43:41 +04:00
item_create.cc
MDEV-6044 MySQL BUG#12735829 - SPACE() FUNCTION WARNING REFERS TO REPEAT() IN ER_WARN_ALLOWED_PACKET_OVERFLOWED
2014-09-04 08:50:06 +04:00
item_create.h
Moving Item::str_value from public to protected.
2014-09-03 01:56:21 +04:00
item_func.cc
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
item_func.h
5.5.39 merge
2014-08-07 18:06:56 +02:00
item_geofunc.cc
MDEV-6073 Merge gis test cases form 5.6.
2014-07-01 00:30:24 +05:00
item_geofunc.h
MDEV-6073 Merge gis test cases form 5.6.
2014-07-01 00:30:24 +05: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-6044 MySQL BUG#12735829 - SPACE() FUNCTION WARNING REFERS TO REPEAT() IN ER_WARN_ALLOWED_PACKET_OVERFLOWED
2014-09-04 08:50:06 +04:00
item_strfunc.h
MDEV-6044 MySQL BUG#12735829 - SPACE() FUNCTION WARNING REFERS TO REPEAT() IN ER_WARN_ALLOWED_PACKET_OVERFLOWED
2014-09-04 08:50:06 +04:00
item_subselect.cc
5.5.39 merge
2014-08-07 18:06:56 +02:00
item_subselect.h
10.0-base merge
2014-02-26 15:28:07 +01:00
item_sum.cc
remove the bug fix for MDEV-6743 "crash in GROUP_CONCAT(IF () ORDER BY 1)"
2014-09-24 13:08:47 +02:00
item_sum.h
5.2 merge
2014-03-16 21:03:01 +01:00
item_timefunc.cc
Moving Item::str_value from public to protected.
2014-09-03 01:56:21 +04:00
item_timefunc.h
5.5.39 merge
2014-08-07 18:06:56 +02:00
item_xmlfunc.cc
MDEV-6661 PI() does not work well in UCS2/UTF16/UTF32 context
2014-09-01 20:57:32 +04:00
item_xmlfunc.h
A joint patch for:
2014-03-23 15:15:07 +04:00
item.cc
Fixed test failures
2014-09-22 23:25:56 +03:00
item.h
Fixed test failures
2014-09-22 23:25:56 +03: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_symbol.h
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
lex.h
Merge the server part of MySQL WL#5522 - InnoDB transportable tablespaces.
2014-02-02 10:00:36 +01:00
lock.cc
bzr merge -r4209 maria/10.0.
2014-05-21 11:09:55 -04:00
lock.h
…
log_event_old.cc
MDEV-6120: When slave stops with error, error message should indicate the failing GTID
2014-07-07 11:17:05 +02:00
log_event_old.h
5.2 merge
2014-03-16 21:03:01 +01:00
log_event.cc
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
log_event.h
MDEV-5799: Error messages written upon LOST EVENTS incident are corrupted
2014-06-25 13:08:30 +02:00
log_slow.h
MDEV-6430: It is impossible to see if "filesort with small limit" optimization was used
2014-07-09 12:32:00 +04:00
log.cc
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
log.h
bzr merge -r4346 maria/10.0 (maria-10.0.13)
2014-08-11 23:55:41 -04:00
main.cc
…
mdl.cc
bzr merge -r4209 maria/10.0.
2014-05-21 11:09:55 -04:00
mdl.h
bzr merge -r4209 maria/10.0.
2014-05-21 11:09:55 -04: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
Fixed assert in perfschema/pfs.cc::start_idle_wait_v1 when using performance schema and big packets in debug version.
2014-07-19 13:38:40 +03: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
…
mysqld_suffix.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
mysqld.cc
bzr merge -r4123..4144 codership/5.6
2014-09-30 18:06:15 -04:00
mysqld.h
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
net_serv.cc
Fixed assert in perfschema/pfs.cc::start_idle_wait_v1 when using performance schema and big packets in debug version.
2014-07-19 13:38:40 +03: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-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
5.5.39 merge
2014-08-07 18:06:56 +02:00
opt_range.h
5.5.39 merge
2014-08-07 18:06:56 +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
…
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
bzr merge -r4209 maria/10.0.
2014-05-21 11:09:55 -04:00
protocol.h
5.5 merge
2014-05-09 12:35:11 +02:00
records.cc
MDEV-6312 HA_MUST_USE_TABLE_CONDITION_PUSHDOWN is not accounted by init_read_record()
2014-07-31 11:08:56 +02:00
records.h
…
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
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
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
5.5.39 merge
2014-08-07 18:06:56 +02:00
rpl_handler.h
5.5.39 merge
2014-08-07 18:06:56 +02: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-6616 Server crashes in my_hash_first if shutdown is performed when FLUSH LOGS is running
2014-09-06 08:33:56 +02:00
rpl_mi.h
MDEV-6462: Slave replicating using GTID doesn't recover correctly when master crashes in the middle of transaction
2014-09-02 14:07:01 +02:00
rpl_parallel.cc
compilation fixes for WITH_ATOMIC_OPS=rwlocks
2014-09-08 12:59:57 +02:00
rpl_parallel.h
MDEV-6321: close_temporary_tables() in format description event not serialised correctly
2014-08-20 10:59:39 +02:00
rpl_record_old.cc
MDEV-6120: When slave stops with error, error message should indicate the failing GTID
2014-07-07 11:17:05 +02:00
rpl_record_old.h
5.2 merge
2014-03-16 21:03:01 +01:00
rpl_record.cc
bzr merge -r4346 maria/10.0 (maria-10.0.13)
2014-08-11 23:55:41 -04:00
rpl_record.h
5.5 merge
2014-02-25 16:04:35 +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
compilation fixes for WITH_ATOMIC_OPS=rwlocks
2014-09-08 12:59:57 +02:00
rpl_rli.h
MDEV-6459 max_relay_log_size and sql_slave_skip_counter misbehave on PPC64
2014-09-10 13:22:44 +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.5.39 merge
2014-08-07 18:06:56 +02:00
scheduler.h
MDEV-5706 MariaDB does not build on hurd-i386
2014-07-25 14:15:33 +02:00
set_var.cc
MDEV#5747: wsrep system variables not listed alphabetically
2014-06-23 19:14:28 -04: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
5.2 merge
2014-03-16 21:03:01 +01:00
slave.cc
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
slave.h
5.5 merge
2014-09-23 23:55:29 +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-09-16 14:03:17 +02:00
sp_head.h
MDEV-6050 MySQL Bug#13036505 62540: TABLE LOCKS WITHIN STORED FUNCTIONS ARE BACK IN 5.5 WITH MIXED AND ROW BI
2014-07-31 12:03:20 +02: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
sp.cc
bzr merge -r4209 maria/10.0.
2014-05-21 11:09:55 -04:00
sp.h
…
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
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04: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
bzr merge -r4104..4120 codership/5.6/
2014-08-12 14:05:44 -04:00
sql_admin.h
10.0-base merge
2014-02-26 15:28:07 +01:00
sql_alter.cc
bzr merge -r4123..4144 codership/5.6
2014-09-30 18:06:15 -04: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
WL#7219: Reverting the wl#7219 patch in mysql-5.5.39-release branch
2014-07-19 11:24:21 +05:30
sql_audit.h
Merge with 10.0-base
2014-03-13 16:43:11 +02:00
sql_base.cc
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
sql_base.h
MDEV-6050 MySQL Bug#13036505 62540: TABLE LOCKS WITHIN STORED FUNCTIONS ARE BACK IN 5.5 WITH MIXED AND ROW BI
2014-07-31 12:03:20 +02:00
sql_binlog.cc
10.0-base merge
2014-02-26 15:28:07 +01:00
sql_binlog.h
…
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
Initial merge result with mariaDB 10: lp:maria
2013-07-13 13:01:13 +03:00
sql_cache.cc
5.5.39 merge
2014-08-07 18:06:56 +02: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
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
sql_class.h
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04: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
bzr merge -rtag:mariadb-10.0.12 maria/10.0
2014-06-19 13:12:38 -04: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
…
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
bzr merge -r4346 maria/10.0 (maria-10.0.13)
2014-08-11 23:55:41 -04:00
sql_delete.h
MWL#205 DELETE with result set (mdev-3814)
2013-08-06 13:31:38 -07:00
sql_derived.cc
crash in main.views (and other view + PS tests)
2014-08-07 21:45:54 +02:00
sql_derived.h
…
sql_do.cc
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_do.h
…
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
Adding Item_string_sys and Item_string_ascii to reduce duplicate code
2014-09-03 18:24:31 +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
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
MDEV-5864 - Reduce usage of LOCK_open: TABLE_SHARE::tdc.free_tables
2014-03-20 11:11:13 +04:00
sql_handler.h
…
sql_help.cc
Adding Item_string_sys and Item_string_ascii to reduce duplicate code
2014-09-03 18:24: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
bzr merge -r4346 maria/10.0 (maria-10.0.13)
2014-08-11 23:55:41 -04: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
5.5 merge
2014-09-16 14:03:17 +02:00
sql_join_cache.h
Fixed bug mdev-6071.
2014-06-10 10:34:58 -07:00
sql_lex.cc
bzr merge -r4346 maria/10.0 (maria-10.0.13)
2014-08-11 23:55:41 -04:00
sql_lex.h
5.5.39 merge
2014-08-07 18:06:56 +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
…
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
…
sql_manager.cc
10.0-base merge
2014-02-26 15:28:07 +01:00
sql_manager.h
…
sql_parse.cc
bzr merge -r4123..4144 codership/5.6
2014-09-30 18:06:15 -04:00
sql_parse.h
* bzr merge -rtag:mariadb-10.0.9 maria/10.0
2014-03-26 14:27:24 -04:00
sql_partition_admin.cc
Merging revision from codership-mysql/5.5 (r3928..3968) and
2014-03-27 16:26:00 -04:00
sql_partition_admin.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_partition.cc
5.5.39 merge
2014-08-07 18:06:56 +02: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_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
bzr merge -r4346 maria/10.0 (maria-10.0.13)
2014-08-11 23:55:41 -04:00
sql_plugin.h
Bug#18903155: BACKPORT BUG-18008907 TO 5.5+ VERSIONS.
2014-06-27 17:04:08 +05:30
sql_prepare.cc
MDEV-6740 : Galera crash in rpl_sql_thread_info/cached_charset_compare
2014-09-22 12:15:44 -04: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
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04: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
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
sql_repl.h
Merge MariaDB 10.0-base to 10.0.
2014-02-10 15:12:17 +01:00
sql_select.cc
MDEV-6743 crash in GROUP_CONCAT(IF () ORDER BY 1)
2014-09-24 15:41:42 +02:00
sql_select.h
5.5.39 merge
2014-08-07 18:06:56 +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
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
sql_show.h
small cleanup of the SHOW CREATE TABLE code
2014-07-08 19:39:06 +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-6181 EITS could eat all tmpdir space and hang
2014-08-04 21:36:02 +02:00
sql_statistics.h
MDEV-6473 - main.statistics fails on PPC64
2014-07-23 12:55:26 +04:00
sql_string.cc
MDEV-6752 Trailing incomplete characters are not replaced to question marks on conversion
2014-09-18 12:40:55 +04:00
sql_string.h
- MDEV-6695 Bad column name for UCS2 string literals
2014-09-04 21:58:48 +04:00
sql_table.cc
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
sql_table.h
5.5.39 merge
2014-08-07 18:06:56 +02:00
sql_tablespace.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_tablespace.h
…
sql_test.cc
Use LOCK_show_status when we add things to all_status_vars
2014-09-15 17:11:01 +03:00
sql_test.h
…
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
bzr merge -r4209 maria/10.0.
2014-05-21 11:09:55 -04:00
sql_trigger.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_truncate.cc
bzr merge -rtag:mariadb-10.0.12 maria/10.0
2014-06-19 13:12:38 -04: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
5.5.39 merge
2014-08-07 18:06:56 +02:00
sql_union.h
…
sql_update.cc
bzr merge -r4346 maria/10.0 (maria-10.0.13)
2014-08-11 23:55:41 -04:00
sql_update.h
…
sql_view.cc
5.5.39 merge
2014-08-07 18:06:56 +02:00
sql_view.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_yacc.yy
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04: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_shared.h
…
sys_vars.cc
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
sys_vars.h
MDEV-6459 max_relay_log_size and sql_slave_skip_counter misbehave on PPC64
2014-09-10 13:22:44 +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
table.cc
bzr merge -rtag:mariadb-10.0.14 maria/10.0/
2014-09-28 20:43:56 -04:00
table.h
5.5 merge
2014-09-16 14:03:17 +02: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_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
threadpool.h
MDEV-5205 - MariaDB does not start if more than 128 cpu's are available
2013-11-05 09:18:59 +04:00
transaction.cc
bzr merge -c4123 codership/5.6/
2014-08-12 14:50:26 -04: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
bzr merge -rtag:mariadb-10.0.12 maria/10.0
2014-06-19 13:12:38 -04:00
tztime.h
…
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-6224 Incorrect information in file when *.frm is > 256K
2014-07-08 19:38:26 +02:00
unireg.h
MDEV-6224 Incorrect information in file when *.frm is > 256K
2014-07-08 19:38:26 +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
wsrep_applier.cc
bzr merge -r4123..4144 codership/5.6
2014-09-30 18:06:15 -04:00
wsrep_applier.h
bzr merge -r3904..3928 lp:codership-mysql/5.5
2013-11-27 00:18:44 +02:00
wsrep_binlog.cc
Fixes for some test failures.
2014-04-09 12:25:47 -04:00
wsrep_binlog.h
bzr merge -r4065..4088 codership/5.6
2014-05-21 17:07:17 -04:00
wsrep_check_opts.cc
MDEV-6447: Galera: Enable QC
2014-09-17 14:59:39 -04:00
wsrep_hton.cc
MDEV-6481: Yum Upgrade on CentOS 6.5 causes instant
2014-10-08 13:30:45 -04:00
wsrep_mysqld.cc
bzr merge -r4123..4144 codership/5.6
2014-09-30 18:06:15 -04:00
wsrep_mysqld.h
bzr merge -r4123..4144 codership/5.6
2014-09-30 18:06:15 -04:00
wsrep_notify.cc
bzr merge -r3968..3984 codership/5.5 (non-Innodb changes only).
2014-05-21 14:32:57 -04:00
wsrep_priv.h
Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API #24
2013-11-26 16:48:30 +02:00
wsrep_sst.cc
Local merge of patch for MDEV-4647 from maria-5.5-galera.
2014-07-22 09:43:42 -04:00
wsrep_sst.h
Local merge of patch for MDEV-4647 from maria-5.5-galera.
2014-07-22 09:43:42 -04:00
wsrep_thd.cc
MDEV-6740 : Galera crash in rpl_sql_thread_info/cached_charset_compare
2014-09-22 12:15:44 -04:00
wsrep_thd.h
MDEV-6602: rpl.rpl_mdev6020 fails sporadically with SIGABRT
2014-08-25 09:13:15 +03:00
wsrep_utils.cc
Merging revision from codership-mysql/5.5 (r3928..3968) and
2014-03-27 16:26:00 -04:00
wsrep_utils.h
bzr merge -r3890..3891 lp:codership-mysql/5.5
2013-11-06 00:29:37 +02:00
wsrep_var.cc
bzr merge -r4123..4144 codership/5.6
2014-09-30 18:06:15 -04:00
wsrep_var.h
bzr merge -c4123 codership/5.6/
2014-08-12 14:50:26 -04:00