..
examples
merge with 5.3
2011-10-19 21:45:18 +02:00
share
Fix test errors like:
2013-07-08 12:57:58 +04:00
add_errmsg
authors.h
5.3 merge
2012-01-13 15:50:02 +01: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
Merge with MariaDB 5.1
2011-11-24 18:48:58 +02:00
CMakeLists.txt
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
contributors.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
create_options.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
create_options.h
merge with 5.3
2011-10-19 21:45:18 +02:00
custom_conf.h
datadict.cc
datadict.h
debug_sync.cc
mdl_sync now works.
2013-07-02 20:43:35 +03:00
debug_sync.h
mdl_sync now works.
2013-07-02 20:43:35 +03:00
derror.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
derror.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
des_key_file.cc
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
des_key_file.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
discover.cc
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
discover.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
event_data_objects.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
event_data_objects.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
event_db_repository.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
event_db_repository.h
5.3 merge
2012-01-13 15:50:02 +01:00
event_parse_data.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
event_parse_data.h
5.3 merge
2012-01-13 15:50:02 +01:00
event_queue.cc
fixes for test failures
2012-09-27 20:09:46 +02:00
event_queue.h
fixes for test failures
2012-09-27 20:09:46 +02:00
event_scheduler.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
event_scheduler.h
fixes for test failures
2012-09-27 20:09:46 +02:00
events.cc
10.0-base merge
2013-01-31 09:48:19 +01:00
events.h
fixes for test failures
2012-09-27 20:09:46 +02:00
field.cc
Fix type_newdecimal.test: Warning was produced instead of NOTE. The cause was typo in the merge.
2013-07-05 09:53:18 +04:00
field.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
field_conv.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
filesort.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
filesort.h
MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.
2012-09-01 14:21:59 -07:00
filesort_utils.cc
MDEV-4011 Added per thread memory counting and usage
2013-01-23 16:16:14 +01:00
filesort_utils.h
MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.
2012-09-01 14:21:59 -07:00
frm_crypt.cc
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
frm_crypt.h
Updated/added copyright headers
2011-06-30 17:46:53 +02: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
Merge with 5.2.
2011-12-11 11:34:44 +02:00
gstream.h
5.3->5.5 merge
2011-11-27 17:46:20 +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
mysql-5.5.22 merge
2012-03-28 01:04:46 +02:00
ha_ndbcluster_binlog.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
ha_ndbcluster_binlog.h
Updated/added copyright headers
2012-02-16 10:48:16 +01:00
ha_ndbcluster_cond.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc
Fix trivial compile failures observed in buildbot
2013-07-05 13:56:05 +04:00
ha_partition.h
Fixed issues with partitions and create temporary table SELECT ...
2013-07-03 22:50:34 +03:00
handler.cc
Fix test errors like:
2013-07-08 12:57:58 +04:00
handler.h
ha_partition.cc and ha_partition.h are now completely merged
2013-06-27 14:01:03 +03:00
hash_filo.cc
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
hash_filo.h
MDEV-4058
2013-06-27 12:51:34 +03:00
hostname.cc
MDEV-4058
2013-07-03 12:19:03 +03:00
hostname.h
MDEV-4058
2013-06-27 12:51:34 +03:00
init.cc
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
init.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
innodb_priv.h
Fixed issues with partitions and create temporary table SELECT ...
2013-07-03 22:50:34 +03:00
item.cc
strict.test now works.
2013-07-02 22:11:12 +03:00
item.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
item_buff.cc
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
item_cmpfunc.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
item_cmpfunc.h
5.5 merge
2013-01-29 15:10:47 +01:00
item_create.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
item_create.h
MDEV-377 Name support for dynamic columns
2012-09-28 14:01:17 +03:00
item_func.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
item_func.h
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
item_geofunc.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
item_geofunc.h
5.3 merge
2013-01-15 19:07:46 +01:00
item_row.cc
5.3 merge
2013-01-28 13:36:05 +01:00
item_row.h
5.3 merge
2012-01-13 15:50:02 +01:00
item_strfunc.cc
The compiler warning about ';' fix.
2013-07-08 09:50:18 +03:00
item_strfunc.h
fixed typo.
2013-07-04 10:39:19 +03:00
item_subselect.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
item_subselect.h
MDEV-3812: Remove unneeded extra call to engine->exec() in Item_subselect::exec, remove enum store_key_result
2012-10-25 15:50:10 +03:00
item_sum.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
item_sum.h
Don't update table and index statics for temporary tables
2013-06-22 18:47:12 +03:00
item_timefunc.cc
Fixed issues with partitions and create temporary table SELECT ...
2013-07-03 22:50:34 +03:00
item_timefunc.h
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
item_xmlfunc.cc
Finished merging wl5986 started by Igor.
2013-06-19 14:32:14 +03:00
item_xmlfunc.h
5.3 merge
2013-01-15 19:07:46 +01:00
key.cc
Push a lot of small fixes to get larger parts to compile
2013-05-21 22:00:08 +03:00
key.h
Push a lot of small fixes to get larger parts to compile
2013-05-21 22:00:08 +03:00
keycaches.cc
remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
2012-12-17 10:56:26 +01:00
keycaches.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
lex.h
Fixed some merge issues:
2013-06-18 02:01:34 +03:00
lex_symbol.h
lock.cc
Fix test errors like:
2013-07-08 12:57:58 +04:00
lock.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
log.cc
MDEV-4756: 10.0-monty tree: log_state.test fails
2013-07-04 15:45:58 +04:00
log.h
Merge mariadb-5.5 -> 10.0-base.
2012-12-16 16:49:19 -08:00
log_event.cc
Fixed some wrong format strings.
2013-06-28 01:53:41 +03:00
log_event.h
5.5 merge
2013-01-29 15:10:47 +01:00
log_event_old.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
log_event_old.h
merge from 5.2
2012-08-24 14:02:32 +02:00
log_slow.h
main.cc
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
mdl.cc
mdl_sync now works.
2013-07-02 20:43:35 +03:00
mdl.h
More merge fixes:
2013-06-16 21:26:40 +03:00
mem_root_array.h
Backport 5.5=>5.1 Patch for Bug#13805127:
2012-04-18 13:14:05 +02:00
message.h
5.3 merge
2012-01-13 15:50:02 +01:00
message.mc
message.rc
mf_iocache.cc
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
MSG00001.bin
multi_range_read.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
multi_range_read.h
Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6
2012-08-01 17:27:34 +03:00
my_apc.cc
10.0-base -> 10.0-monty
2012-10-19 20:38:59 +02:00
my_apc.h
MWL#182: Explain running statements
2012-07-17 21:52:08 +04:00
my_decimal.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
my_decimal.h
more fixes for test cases
2012-10-01 13:15:29 +02:00
mysql_install_db.cc
MDEV-3847 : MSI installer does not work.
2012-11-09 18:23:10 +01:00
mysql_upgrade_service.cc
mysqld.cc
MDEV-4058
2013-06-27 12:51:34 +03:00
mysqld.h
MDEV-4058
2013-06-27 12:51:34 +03:00
mysqld_suffix.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
net_serv.cc
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +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.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
opt_range.h
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
opt_range_mrr.cc
Push a lot of small fixes to get larger parts to compile
2013-05-21 22:00:08 +03:00
opt_subselect.cc
ha_partition.cc and ha_partition.h are now completely merged
2013-06-27 14:01:03 +03:00
opt_subselect.h
fixes for test failures
2012-09-27 20:09:46 +02:00
opt_sum.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
opt_table_elimination.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03: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.5.18 merge
2011-11-03 19:17:05 +01:00
partition_info.cc
Fixed a failure in partition_truncate.test.
2013-07-08 12:55:11 -07:00
partition_info.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
password.c
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
plistsort.c
procedure.cc
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
procedure.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
protocol.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
protocol.h
MWL#182: Explain running statements: address review feedback
2012-07-10 21:23:00 +04:00
records.cc
5.5 merge
2013-01-29 15:10:47 +01:00
records.h
5.3->5.5 merge
2011-11-22 18:04:38 +01:00
repl_failsafe.cc
10.0-base -> 10.0-monty
2012-10-19 20:38:59 +02:00
repl_failsafe.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
replication.h
fixes for test failures
2012-09-27 20:09:46 +02:00
rpl_constants.h
rpl_filter.cc
cleanup: use MYF() for mysys flags
2013-01-23 16:18:09 +01:00
rpl_filter.h
Make Replication filter settings dynamic.
2012-03-19 15:00:23 -07:00
rpl_handler.cc
cleanup: use MYF() for mysys flags
2013-01-23 16:18:09 +01:00
rpl_handler.h
cleanup: use MYF() for mysys flags
2013-01-23 16:18:09 +01:00
rpl_injector.cc
mysql-5.5.22 merge
2012-03-28 01:04:46 +02:00
rpl_injector.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
rpl_mi.cc
Fixed issues with partitions and create temporary table SELECT ...
2013-07-03 22:50:34 +03:00
rpl_mi.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
rpl_record.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
rpl_record.h
Merge 5.3->5.5
2012-03-17 01:26:58 -07:00
rpl_record_old.cc
Merge 5.3->5.5
2012-03-17 01:26:58 -07:00
rpl_record_old.h
Merge 5.3->5.5
2012-03-17 01:26:58 -07:00
rpl_reporting.cc
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
rpl_reporting.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
rpl_rli.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
rpl_rli.h
Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.
2012-10-03 01:44:54 +03:00
rpl_tblmap.cc
cleanup: use MYF() for mysys flags
2013-01-23 16:18:09 +01:00
rpl_tblmap.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
rpl_utility.cc
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
rpl_utility.h
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
scheduler.cc
MDEV-3945 - do not hold LOCK_thread_count when freeing THD.
2012-12-21 00:12:37 +01:00
scheduler.h
MDEV-531 : Warning: Forcing close of thread ... in rpl_binlog_index
2012-11-02 10:43:52 +01:00
set_var.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
set_var.h
remove "invisible sysvars" oxymoron
2013-02-02 12:52:44 +01:00
sha2.cc
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
signal_handler.cc
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
slave.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
slave.h
Implementation of Multi-source replication (MDEV:253)
2012-09-28 02:06:56 +03:00
sp.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sp.h
Merge with MariaDB 5.1
2011-11-24 18:48:58 +02:00
sp_cache.cc
mysql-5.5.22 merge
2012-03-28 01:04:46 +02:00
sp_cache.h
mysql-5.5.22 merge
2012-03-28 01:04:46 +02:00
sp_head.cc
Fix limit_rows_examined.test:
2013-07-05 15:25:01 +04:00
sp_head.h
Fix compile error on Windows
2013-07-05 15:20:39 +04:00
sp_pcontext.cc
Finished merging wl5986 started by Igor.
2013-06-19 14:32: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
A fix of unions with duplicate rows and returning bug fix for lp:732124 union + limit returns wrong result
2013-06-26 13:17:27 +03:00
sp_rcontext.h
A fix of unions with duplicate rows and returning bug fix for lp:732124 union + limit returns wrong result
2013-06-26 13:17:27 +03:00
spatial.cc
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
2012-11-09 10:11:20 +02:00
spatial.h
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sql_acl.cc
MDEV-4058
2013-07-03 12:19:03 +03:00
sql_acl.h
Fixed some merge issues:
2013-06-18 02:01:34 +03:00
sql_admin.cc
Fix merge.test failure
2013-07-09 15:42:36 +04:00
sql_admin.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03: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
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sql_analyse.h
MDEV-4011 Added per thread memory counting and usage
2013-01-23 16:16:14 +01:00
sql_array.h
Fixed memory leaks. alias.test now runs clean with valgrind
2013-06-20 14:49:25 +03:00
sql_audit.cc
5.5 merge
2013-01-29 15:10:47 +01:00
sql_audit.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_base.cc
Fix assert failures in main.merge test (line 234) and main.merge_mmap (line 44)
2013-07-08 20:21:27 +04:00
sql_base.h
merge of 2876.430.11 & 2876.430.1
2013-06-27 17:42:18 +03:00
sql_binlog.cc
compilation warning: unused variable
2012-03-05 21:55:25 +01:00
sql_binlog.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_bitmap.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_bootstrap.cc
MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails
2012-12-16 21:11:24 +01:00
sql_bootstrap.h
MDEV-3816 init-file stops getting executed if a long enough line is encountered; on a debug version, assertion `! is_set() || can_overwrite_status' fails
2012-12-16 21:11:24 +01:00
sql_builtin.cc.in
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_cache.cc
Fixed issues with partitions and create temporary table SELECT ...
2013-07-03 22:50:34 +03:00
sql_cache.h
Fixed issues with partitions and create temporary table SELECT ...
2013-07-03 22:50:34 +03:00
sql_callback.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_class.cc
Pull of revision 3313 (Pre-requisite patch for Bug#11763162 (55843 - Handled condition
2013-07-02 16:44:53 +03:00
sql_class.h
strict.test now works.
2013-07-02 22:11:12 +03:00
sql_client.cc
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sql_cmd.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_connect.cc
MDEV-4058
2013-06-27 12:51:34 +03:00
sql_connect.h
Bug#14003080:65104: MAX_USER_CONNECTIONS WITH PROCESSLIST EMPTY
2012-05-28 11:14:43 +05:30
sql_const.h
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02: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
10.0-base -> 10.0-monty
2012-10-19 20:38:59 +02:00
sql_cursor.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_db.cc
merge of 2876.430.11 & 2876.430.1
2013-06-27 17:42:18 +03:00
sql_db.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_delete.cc
A fix of unions with duplicate rows and returning bug fix for lp:732124 union + limit returns wrong result
2013-06-26 13:17:27 +03:00
sql_delete.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_derived.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_derived.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_do.cc
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_do.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_error.cc
Fix trivial compile failures observed in buildbot
2013-07-05 13:56:05 +04:00
sql_error.h
Fixed some memory leaks
2013-06-19 22:57:46 +03:00
sql_expression_cache.cc
MDEV-452 Add full support for auto-initialized/updated timestamp and datetime
2012-10-17 15:43:56 +03: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
Fix test errors like:
2013-07-08 12:57:58 +04:00
sql_handler.h
merge with 5.3
2011-10-19 21:45:18 +02:00
sql_help.cc
mysql-5.5.29 merge
2013-01-15 19:13:32 +01:00
sql_help.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_hset.h
sql_insert.cc
merge of 2876.430.11 & 2876.430.1
2013-06-27 17:42:18 +03:00
sql_insert.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_join_cache.cc
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sql_join_cache.h
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sql_lex.cc
Fixed some merge issues:
2013-06-18 02:01:34 +03:00
sql_lex.h
Fixed some merge issues:
2013-06-18 02:01:34 +03: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
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_list.h
5.3 merge
2013-01-15 19:07:46 +01:00
sql_load.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_load.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_locale.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_locale.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_manager.cc
5.3.4 merge
2012-02-15 18:08:08 +01:00
sql_manager.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_parse.cc
merge of 2876.430.11 & 2876.430.1
2013-06-27 17:42:18 +03:00
sql_parse.h
5.3->5.5 merge
2011-11-22 18:04:38 +01:00
sql_partition.cc
Fixed issues with partitions and create temporary table SELECT ...
2013-07-03 22:50:34 +03:00
sql_partition.h
ha_partition.cc and ha_partition.h are now completely merged
2013-06-27 14:01:03 +03:00
sql_partition_admin.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_partition_admin.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_plist.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_plugin.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_plugin.h
MDEV-3860 backport --plugin-load-add (and related mysql-test changes)
2012-12-15 18:24:11 +01:00
sql_plugin_services.h
MDEV-4065 thd_kill_statement service
2013-01-18 19:04:23 +01:00
sql_prepare.cc
merge of 2876.430.11 & 2876.430.1
2013-06-27 17:42:18 +03:00
sql_prepare.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_priv.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_profile.cc
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sql_profile.h
5.3 merge
2013-01-15 19:07:46 +01:00
sql_reload.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_reload.h
sql_rename.cc
merge of 2876.430.11 & 2876.430.1
2013-06-27 17:42:18 +03:00
sql_rename.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_repl.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_repl.h
MDEV-3984: Double free of Master_info * when CHANGE MASTER fails.
2013-01-30 15:11:36 +01:00
sql_select.cc
ha_partition.cc and ha_partition.h are now completely merged
2013-06-27 14:01:03 +03:00
sql_select.h
Merge MariaDB 10.0-base to MariaDB 10.0
2012-12-18 15:01:58 +01: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
2011-06-30 17:46:53 +02:00
sql_show.cc
A fix of unions with duplicate rows and returning bug fix for lp:732124 union + limit returns wrong result
2013-06-26 13:17:27 +03:00
sql_show.h
Merge mariadb-5.5 -> 10.0-base.
2012-12-16 16:49:19 -08:00
sql_signal.cc
Finished merging wl5986 started by Igor.
2013-06-19 14:32:14 +03:00
sql_signal.h
Finished merging wl5986 started by Igor.
2013-06-19 14:32:14 +03:00
sql_sort.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
sql_state.c
Fix for MDEV-533: Confusing error code when doing auto-increment insert for out-of-range values
2012-09-18 15:14:19 +03:00
sql_statistics.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_statistics.h
Fixed bug mdev-3979.
2013-01-08 08:17:51 -08:00
sql_string.cc
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sql_string.h
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sql_table.cc
Fix test failure in myisam.test:
2013-07-08 18:14:24 +04:00
sql_table.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_tablespace.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_tablespace.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_test.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_test.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_time.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_time.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_trigger.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_trigger.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_truncate.cc
merge of 2876.430.11 & 2876.430.1
2013-06-27 17:42:18 +03: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
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_union.cc
A fix of unions with duplicate rows and returning bug fix for lp:732124 union + limit returns wrong result
2013-06-26 13:17:27 +03:00
sql_union.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_update.cc
A fix of unions with duplicate rows and returning bug fix for lp:732124 union + limit returns wrong result
2013-06-26 13:17:27 +03:00
sql_update.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_view.cc
merge of 2876.430.11 & 2876.430.1
2013-06-27 17:42:18 +03:00
sql_view.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sql_yacc.yy
Finished merging wl5986 started by Igor.
2013-06-19 14:32:14 +03:00
strfunc.cc
Fixed issues with partitions and create temporary table SELECT ...
2013-07-03 22:50:34 +03:00
strfunc.h
Fixed issues with partitions and create temporary table SELECT ...
2013-07-03 22:50:34 +03:00
structs.h
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
sys_vars.cc
Merge from mysql-5.6 fix for bug#11761752 (was already partially merged)
2013-07-05 19:40:34 +04:00
sys_vars.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
sys_vars_shared.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
table.cc
mdl_sync now works.
2013-07-02 20:43:35 +03:00
table.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
thr_malloc.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
thr_malloc.h
MDEV-4011 Added per thread memory counting and usage
2013-01-23 16:16:14 +01:00
threadpool.h
Added copiright, some more comments
2012-02-17 23:27:15 +01:00
threadpool_common.cc
MDEV-3945 - do not hold LOCK_thread_count when freeing THD.
2012-12-21 00:12:37 +01:00
threadpool_unix.cc
merge with 5.5
2012-11-03 12:28:51 +01:00
threadpool_win.cc
merge with 5.5
2012-11-03 12:28:51 +01:00
transaction.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
transaction.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
tzfile.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
tztime.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03: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
5.5 merge
2013-01-29 15:10:47 +01:00
unireg.cc
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
unireg.h
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03: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