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
ffa8c4cfcc41d4f160e3bdfca5cfd4b01a7d6e63
mariadb/sql
History
Sergei Golubchik ffa8c4cfcc Percona-Server-5.6.14-rel62.0 merge 
support ha_innodb.so as a dynamic plugin.
* remove obsolete *,innodb_plugin.rdiff files
* s/--plugin-load=/--plugin-load-add=/
* MYSQL_PLUGIN_IMPORT glob_hostname[]
* use my_error instead of push_warning_printf(ER_DEFAULT)
* don't use tdc_size and tc_size in a module

update test cases (XtraDB is 5.6.14, InnoDB is 5.6.10)
* copy new tests over
* disable some tests for (old) InnoDB
* delete XtraDB tests that no longer apply

small compatibility changes:
* s/HTON_EXTENDED_KEYS/HTON_SUPPORTS_EXTENDED_KEYS/
* revert unnecessary InnoDB changes to make it a bit closer to the upstream

fix XtraDB to compile on Windows (both as a static and a dynamic plugin)

disable XtraDB on Windows (deadlocks) and where no atomic ops are available (e.g. CentOS 5)


storage/innobase/handler/ha_innodb.cc:
  revert few unnecessary changes to make it a bit closer to the original InnoDB
storage/innobase/include/univ.i:
  correct the version to match what it was merged from
2013-12-22 17:06:50 +01:00
..
examples
merge with 5.3
2011-10-19 21:45:18 +02:00
share
Percona-Server-5.6.14-rel62.0 merge
2013-12-22 17:06:50 +01:00
add_errmsg
…
authors.h
Added information about the MariaDB foundation
2013-09-23 20:27:37 +03: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
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
2013-11-01 12:00:11 +01: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
Added information about the MariaDB foundation
2013-09-23 20:27:37 +03:00
create_options.cc
Enable TokuDB online ALTER
2013-09-25 19:42:22 +02:00
create_options.h
Enable TokuDB online ALTER
2013-09-25 19:42:22 +02:00
custom_conf.h
Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 15:53:48 +01:00
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
db.opt
Bug#16062056 REMOVE THE "DUMMY.BAK" FILE FROM THE TEST DATABASE, AND ADD DB.OPT
2013-02-25 10:42:40 +01: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
10.0-monty merge
2013-07-21 16:39:19 +02:00
discover.h
10.0-monty merge
2013-07-21 16:39:19 +02:00
event_data_objects.cc
10.0-base merge
2013-11-13 23:03:48 +01:00
event_data_objects.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
event_db_repository.cc
10.0-monty merge
2013-07-21 16:39:19 +02:00
event_db_repository.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +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
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
event_queue.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
event_scheduler.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
event_scheduler.h
10.0-base merge
2013-12-16 13:02:21 +01:00
events.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
events.h
10.0-base merge
2013-12-16 13:02:21 +01:00
field_conv.cc
cleanup
2013-08-12 22:05:23 +02:00
field.cc
merge 10.0-base -> 10.0
2013-10-29 22:20:45 +02:00
field.h
10.0-base merge.
2013-09-21 10:14:42 +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-415: Back-port of the WL task #1393 from the mysql-5.6 code line.
2012-09-01 14:21:59 -07:00
filesort.cc
MDEV-4243 [PATCH] Warnings/errors while compiling with clang
2013-11-28 22:35:59 +01: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
bug #901655 ST_BUFFER asserts with a coplicated shape.
2011-12-08 16:29:45 +04:00
gcalc_tools.cc
5.3 merge
2012-01-13 15:50:02 +01:00
gcalc_tools.h
5.3->5.5 merge
2011-11-27 17:46:20 +01:00
gen_lex_hash.cc
Merge MySQL 5.1.66 -> MariaDB 5.1.65
2012-11-06 11:52:55 +02:00
gstream.cc
Updated/added copyright headers.
2013-02-25 15:26:00 +01:00
gstream.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
ha_ndbcluster_binlog.cc
10.0-base merge
2013-12-16 13:02:21 +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-monty merge
2013-07-21 16:39:19 +02:00
ha_ndbcluster_cond.h
Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 15:53:48 +01:00
ha_ndbcluster_tables.h
Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 15:53:48 +01:00
ha_ndbcluster.cc
Fixed issues with partitions and create temporary table SELECT ...
2013-07-03 22:50:34 +03:00
ha_ndbcluster.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
ha_partition.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
ha_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
handler.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
handler.h
Percona-Server-5.6.14-rel62.0 merge
2013-12-22 17:06:50 +01:00
hash_filo.cc
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
hash_filo.h
MDEV-4058
2013-06-27 12:51:34 +03:00
hostname.cc
MDEV-4243 [PATCH] Warnings/errors while compiling with clang
2013-11-28 22:35:59 +01: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
10.0-base merge
2013-12-16 13:02:21 +01:00
item_cmpfunc.h
5.5 merge
2013-11-23 00:50:54 +01:00
item_create.cc
Merge 10.0-base -> 10.0
2013-10-15 10:26:08 +04:00
item_create.h
Adding support for the SQL-standard temporal literals.
2013-07-10 12:12:27 +04:00
item_func.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
item_func.h
10.0-base merge
2013-12-16 13:02:21 +01:00
item_geofunc.cc
merge 5.3 -> 5.5
2013-09-25 17:16:13 +03:00
item_geofunc.h
merge 5.3 -> 5.5
2013-09-25 17:16:13 +03:00
item_row.cc
merge 5.5 -> 10.0-base
2013-09-25 21:07:06 +03:00
item_row.h
5.3 merge
2012-01-13 15:50:02 +01:00
item_strfunc.cc
Do the partial merge of WL#5602 correctly:
2013-12-09 12:38:02 +01:00
item_strfunc.h
Do the partial merge of WL#5602 correctly:
2013-12-09 12:38:02 +01:00
item_subselect.cc
MDEV-4243 [PATCH] Warnings/errors while compiling with clang
2013-11-28 22:35:59 +01:00
item_subselect.h
5.5 merge
2013-03-27 23:41:02 +01:00
item_sum.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
item_sum.h
5.5 merge
2013-07-17 21:24:29 +02:00
item_timefunc.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
item_timefunc.h
10.0-base merge
2013-12-16 13:02:21 +01:00
item_xmlfunc.cc
merge 5.3 -> 5.5
2013-09-25 17:16:13 +03:00
item_xmlfunc.h
MDEV-4243 [PATCH] Warnings/errors while compiling with clang
2013-11-28 22:35:59 +01:00
item.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
item.h
10.0-base merge
2013-12-16 13:02:21 +01:00
key.cc
MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1
2013-11-28 12:10:44 +01:00
key.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
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
Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 15:53:48 +01:00
lex.h
10.0-base merge (roles)
2013-10-29 15:08:44 +01:00
lock.cc
10.0-monty merge
2013-07-21 16:39:19 +02:00
lock.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
log_event_old.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
log_event_old.h
MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work
2013-12-09 12:37:45 +01:00
log_event.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
log_event.h
MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work
2013-12-09 12:37:45 +01:00
log_slow.h
MDEV-407: Print EXPLAIN [ANALYZE] in the slow query log
2013-09-19 08:33:58 +04:00
log.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
log.h
MDEV-4982: GTID looses all binlog state after crash if InnoDB is disabled
2013-11-21 14:42:25 +01:00
main.cc
…
mdl.cc
add metadata_lock_info
2013-12-11 00:31:04 +09:00
mdl.h
MDEV-4748 - metadata_lock_info plugin
2013-12-16 12:26:20 +04:00
mem_root_array.h
Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 15:53:48 +01:00
message.h
5.3 merge
2012-01-13 15:50:02 +01:00
message.mc
…
message.rc
…
mf_iocache.cc
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
MSG00001.bin
…
multi_range_read.cc
merge 5.5 -> 10.0-base
2013-09-25 21:07:06 +03: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-5220 - [PATCH] MariaDB 10.0.4 doesn't compile without perfschema
2013-11-14 18:00:00 +04:00
my_decimal.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
my_decimal.h
10.0-base merge
2013-07-18 16:46:57 +02: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
10.0-base merge
2013-12-16 13:02:21 +01:00
mysqld.h
Percona-Server-5.6.14-rel62.0 merge
2013-12-22 17:06:50 +01:00
net_serv.cc
10.0-monty merge
2013-07-21 16:39:19 +02:00
nt_servc.cc
Bug#11754011: 45546: START WINDOWS SERVICE, THEN EXECUTE WHAT IS NEEDED.
2011-12-13 17:44:19 +02:00
nt_servc.h
Bug#11754011: 45546: START WINDOWS SERVICE, THEN EXECUTE WHAT IS NEEDED.
2011-12-13 17:44:19 +02:00
opt_index_cond_pushdown.cc
Push a lot of small fixes to get larger parts to compile
2013-05-21 22:00:08 +03:00
opt_range_mrr.cc
10.0-monty merge
2013-07-21 16:39:19 +02:00
opt_range.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
opt_range.h
Merge 10.0-base -> 10.0
2013-10-16 13:38:42 +04:00
opt_subselect.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
opt_subselect.h
merge 5.5 -> 10.0-base
2013-09-25 21:07:06 +03:00
opt_sum.cc
10.0-base merge
2013-11-13 23:03:48 +01:00
opt_table_elimination.cc
10.0-base merge
2013-12-16 13:02:21 +01: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
MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1
2013-11-28 12:10:44 +01:00
partition_info.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
partition_info.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
password.c
Do the partial merge of WL#5602 correctly:
2013-12-09 12:38:02 +01:00
plistsort.c
…
procedure.cc
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
procedure.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
protocol.cc
10.0-monty merge
2013-07-21 16:39:19 +02:00
protocol.h
MWL#182: Explain running statements: address review feedback
2012-07-10 21:23:00 +04:00
records.cc
5.5 merge and fixes for compiler/test errors
2013-09-18 13:07:31 +02:00
records.h
5.3->5.5 merge
2011-11-22 18:04:38 +01:00
repl_failsafe.cc
Merge 10.0-base -> 10.0 (GTID).
2013-04-17 15:17:01 +02:00
repl_failsafe.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
replication.h
fixes for test failures
2012-09-27 20:09:46 +02:00
rpl_constants.h
MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work
2013-12-09 12:37:45 +01:00
rpl_filter.cc
5.5 merge
2013-07-17 21:24:29 +02:00
rpl_filter.h
Makeing rpl_filter for each Master_info.
2013-04-16 19:43:28 +08:00
rpl_gtid.cc
MDEV-4816: Incorrect disabling of binlog for mysql.gtid_slave_pos update
2013-11-27 11:02:08 +01:00
rpl_gtid.h
MDEV-5306: Missing locking around rpl_global_gtid_binlog_state
2013-11-18 15:22:50 +01:00
rpl_handler.cc
MDEV-26: Global transaction ID. First alpha release.
2013-04-15 10:55:27 +02:00
rpl_handler.h
cleanup: use MYF() for mysys flags
2013-01-23 16:18:09 +01:00
rpl_injector.cc
MDEV-500: Session variable for server_id
2012-10-23 12:46:29 +02:00
rpl_injector.h
Updated/added copyright headers.
2013-02-25 15:26:00 +01:00
rpl_mi.cc
10.0-monty merge
2013-07-21 16:39:19 +02:00
rpl_mi.h
Merge 10.0-base -> 10.0
2013-10-15 10:26:08 +04:00
rpl_parallel.cc
merge 10-base->10.0
2013-11-11 23:40:53 +02:00
rpl_parallel.h
MDEV-4506: Parallel replication
2013-11-05 12:01:26 +01:00
rpl_record_old.cc
MDEV-4506: parallel replication.
2013-09-16 14:33:49 +02:00
rpl_record_old.h
MDEV-4506: parallel replication.
2013-09-16 14:33:49 +02:00
rpl_record.cc
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
2013-11-01 12:00:11 +01:00
rpl_record.h
MDEV-4506: Parallel replication: Fix Windows compiler failure.
2013-09-19 20:54:08 +02:00
rpl_reporting.cc
Instead of writing "Errcode" to the log for Slave errors, use "Internal MariaDB error code"
2013-05-03 01:54:47 +03:00
rpl_reporting.h
…
rpl_rli.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
rpl_rli.h
MDEV-4506: Parallel replication.
2013-11-08 15:14:18 +01: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
10.0-base merge
2013-12-16 13:02:21 +01:00
rpl_utility.h
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
2013-11-01 12:00:11 +01:00
scheduler.cc
10.0-base merge
2013-04-15 15:09:22 +02:00
scheduler.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
set_var.cc
10.0-base merge (roles)
2013-10-29 15:08:44 +01:00
set_var.h
Modified set_role_var to implement both a role check in the check() function,
2013-10-17 20:39:23 -07:00
sha2.cc
…
signal_handler.cc
10.0-base merge.
2013-09-21 10:14:42 +02:00
slave.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
slave.h
MDEV-4506: Parallel replication.
2013-10-28 13:24:56 +01:00
sp_cache.cc
mysql-5.5.22 merge
2012-03-28 01:04:46 +02:00
sp_cache.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sp_head.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sp_head.h
Fix compile error on Windows
2013-07-05 15:20:39 +04: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
10.0-monty merge
2013-07-21 16:39:19 +02:00
sp.cc
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
2013-11-01 12:00:11 +01:00
sp.h
Merge with MariaDB 5.1
2011-11-24 18:48:58 +02:00
spatial.cc
MDEV-4788 check mysql-5.5 changes in spatial.cc.
2013-10-10 14:20:35 +05:00
spatial.h
10.0-base merge.
2013-09-21 10:14:42 +02:00
sql_acl.cc
MDEV-5438 A view can mask a table that supports discovery
2013-12-13 14:26:10 +01:00
sql_acl.h
10.0-base merge (roles)
2013-10-29 15:08:44 +01:00
sql_admin.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_admin.h
10.0-monty merge
2013-07-21 16:39:19 +02:00
sql_alter.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_alter.h
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sql_analyse.cc
10.0-monty merge
2013-07-21 16:39:19 +02:00
sql_analyse.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_array.h
10.0-base merge (roles)
2013-10-29 15:08:44 +01:00
sql_audit.cc
5.5 merge and fixes for compiler/test errors
2013-09-18 13:07:31 +02:00
sql_audit.h
10.0-base merge.
2013-09-21 10:14:42 +02:00
sql_base.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_base.h
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_binlog.cc
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
2013-11-01 12:00:11 +01:00
sql_binlog.h
…
sql_bitmap.h
5.5 merge and fixes for compiler/test errors
2013-09-18 13:07:31 +02:00
sql_bootstrap.cc
MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails
2012-12-16 21:11:24 +01:00
sql_bootstrap.h
MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails
2012-12-16 21:11:24 +01:00
sql_builtin.cc.in
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_cache.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_cache.h
MDEV-4786 merge 10.0-monty -> 10.0
2013-08-12 14:17:51 +02:00
sql_callback.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_class.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_class.h
10.0-base merge
2013-12-16 13:02:21 +01: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
WL#7076: Backporting wl6715 to support both formats
2013-08-23 09:07:09 +05:30
sql_connect.h
Bug#14003080:65104: MAX_USER_CONNECTIONS WITH PROCESSLIST EMPTY
2012-05-28 11:14:43 +05:30
sql_const.h
MDEV-4841 Wrong character set of ADDTIME() and DATE_ADD()
2013-08-22 13:59:30 +04:00
sql_crypt.cc
Initail merge with MySQL 5.1 (XtraDB still needs to be merged)
2011-11-21 19:13:14 +02:00
sql_crypt.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_cursor.cc
Fixed bug mdev-5028.
2013-10-02 17:59:56 -07:00
sql_cursor.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_db.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_db.h
s/st_ha_create_information/HA_CREATE_INFO/
2013-04-07 15:35:39 +02:00
sql_delete.cc
Merge 10.0-base -> 10.0
2013-10-16 13:38:42 +04:00
sql_delete.h
MWL#205 DELETE with result set (mdev-3814)
2013-08-06 13:31:38 -07:00
sql_derived.cc
merge 10.0-base -> 10.0
2013-10-29 22:20:45 +02:00
sql_derived.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_do.cc
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_do.h
…
sql_error.cc
10.0-monty merge
2013-07-21 16:39:19 +02:00
sql_error.h
MDEV-4928 Merge collation customization improvements
2013-10-02 15:04:07 +04:00
sql_explain.cc
Merge 10.0-base -> 10.0
2013-10-16 20:20:20 +04:00
sql_explain.h
Better comments
2013-10-17 17:50:30 +04:00
sql_expression_cache.cc
5.5 merge
2013-07-17 21:24:29 +02:00
sql_expression_cache.h
fix the include guards and add missing gplv2 headers
2012-02-17 12:19:38 +01:00
sql_get_diagnostics.cc
Fixed some memory leaks
2013-06-19 22:57:46 +03:00
sql_get_diagnostics.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_handler.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_handler.h
merge with 5.3
2011-10-19 21:45:18 +02:00
sql_help.cc
mysql-5.5.32 merge
2013-07-16 19:09:54 +02:00
sql_help.h
…
sql_hset.h
find() method for Hash_set<>.
2013-10-18 12:36:03 -07:00
sql_insert.cc
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
2013-11-01 12:00:11 +01:00
sql_insert.h
…
sql_join_cache.cc
Merge 10.0-base -> 10.0
2013-10-16 13:38:42 +04:00
sql_join_cache.h
Merge 10.0-base -> 10.0
2013-10-16 13:38:42 +04:00
sql_lex.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_lex.h
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_lifo_buffer.h
fix the include guards and add missing gplv2 headers
2012-02-17 12:19:38 +01:00
sql_list.cc
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_list.h
5.3->5.5 merge
2013-02-28 22:47:29 +01:00
sql_load.cc
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
2013-11-01 12:00:11 +01:00
sql_load.h
…
sql_locale.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_locale.h
…
sql_manager.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_manager.h
…
sql_parse.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_parse.h
10.0-base merge
2013-11-13 23:03:48 +01:00
sql_partition_admin.cc
fix tests that were relying on @@have_partitioning
2013-08-15 10:47:18 +02:00
sql_partition_admin.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_partition.cc
MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1
2013-11-28 12:10:44 +01:00
sql_partition.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
add a forgotten my_afree() to make valgrind happy
2013-12-12 20:30:56 +01:00
sql_plugin.h
remove sys_var specific restore_pluginvar_names() function,
2013-12-09 12:39:19 +01:00
sql_prepare.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_prepare.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_priv.h
10.0-monty merge
2013-07-21 16:39:19 +02:00
sql_profile.cc
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sql_profile.h
Updated/added copyright headers.
2013-02-25 15:26:00 +01:00
sql_reload.cc
10.0-base merge.
2013-09-21 10:14:42 +02:00
sql_reload.h
MDEV-4547 [PATCH] Make REFRESH_* constants to be 64-bit in 32-bit compilation
2013-07-16 15:16:38 +03:00
sql_rename.cc
10.0-base merge.
2013-09-21 10:14:42 +02:00
sql_rename.h
test_sql_discovery storage engine
2013-04-09 16:07:35 +02:00
sql_repl.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_repl.h
MDEV-5220 - [PATCH] MariaDB 10.0.4 doesn't compile without perfschema
2013-11-14 18:00:00 +04:00
sql_select.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_select.h
merge 10.0-base -> 10.0
2013-10-29 22:20:45 +02:00
sql_servers.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_servers.h
Updated/added copyright headers.
2013-02-25 15:26:00 +01:00
sql_show.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_show.h
MDEV-4911 - add KILL query id, and add query id information to processlist
2013-09-13 20:14:56 +04: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
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_state.c
mysql-5.5.32 merge
2013-07-16 19:09:54 +02:00
sql_statistics.cc
10.0-monty merge
2013-07-21 16:39:19 +02:00
sql_statistics.h
10.0-monty merge
2013-07-21 16:39:19 +02:00
sql_string.cc
Merging my_convert() from 10.0-serg
2013-08-01 17:03:15 +04:00
sql_string.h
Merge 10.0-base -> 10.0
2013-10-16 13:38:42 +04:00
sql_table.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_table.h
10.0-base merge
2013-11-04 21:47:54 +01: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
MDEV-5388 - Reduce usage of LOCK_open: unused_tables
2013-12-12 21:49:14 +04:00
sql_test.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_time.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_time.h
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_trigger.cc
10.0-base merge (roles)
2013-10-29 15:08:44 +01:00
sql_trigger.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_truncate.cc
MDEV-4786 merge 10.0-monty -> 10.0
2013-08-12 15:46:35 +02:00
sql_truncate.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_udf.cc
cleanup: use MYF() for mysys flags
2013-01-23 16:18:09 +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
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_union.h
…
sql_update.cc
Merge 10.0-base -> 10.0
2013-10-16 13:38:42 +04:00
sql_update.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_view.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
sql_view.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_yacc.yy
cleanups:
2013-12-09 12:38:30 +01:00
strfunc.cc
10.0-monty merge
2013-07-21 16:39:19 +02: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
10.0-base merge
2013-12-16 13:02:21 +01:00
sys_vars.h
10.0-base merge.
2013-09-21 10:14:42 +02:00
table_cache.cc
MDEV-5388 - Reduce usage of LOCK_open: unused_tables
2013-12-12 21:49:14 +04:00
table_cache.h
MDEV-5388 - Reduce usage of LOCK_open: unused_tables
2013-12-12 21:49:14 +04:00
table.cc
Percona-Server-5.6.14-rel62.0 merge
2013-12-22 17:06:50 +01:00
table.h
MDEV-5388 - Reduce usage of LOCK_open: unused_tables
2013-12-12 21:49:14 +04:00
thr_malloc.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
thr_malloc.h
MDEV-4011 Added per thread memory counting and usage
2013-01-23 16:16:14 +01:00
threadpool_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
merge 10-base->10.0
2013-11-11 23:40:53 +02: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
10.0-base merge
2013-12-16 13:02:21 +01:00
transaction.h
Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEAR
2013-08-20 13:12:34 +04:00
tzfile.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
tztime.cc
10.0-base merge
2013-12-16 13:02:21 +01:00
tztime.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
udf_example.c
5.3 merge
2012-01-13 15:50:02 +01:00
udf_example.def
…
uniques.cc
Fixed bug mdev-4369.
2013-04-06 15:36:28 -07:00
unireg.cc
10.0-monty merge
2013-07-21 16:39:19 +02:00
unireg.h
10.0-monty merge
2013-07-21 16:39:19 +02:00
winservice.c
Merge 5.3->5.5
2012-03-17 01:26:58 -07:00
winservice.h
fix the include guards and add missing gplv2 headers
2012-02-17 12:19:38 +01:00