..
examples
share
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
2012-11-09 10:11:20 +02:00
.cvsignore
Applying patch for Bug#67177 Bug#15967374 from Kent
2013-01-08 13:29:11 +01:00
add_errmsg
authors.h
client_settings.h
CMakeLists.txt
merge
2012-04-05 23:07:18 +02:00
contributors.h
create_options.cc
Merge from 5.1.
2012-09-26 18:29:49 +02:00
create_options.h
custom_conf.h
debug_sync.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
debug_sync.h
derror.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
des_key_file.cc
discover.cc
event_data_objects.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
event_data_objects.h
event_db_repository.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
event_db_repository.h
event_parse_data.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
event_parse_data.h
event_queue.cc
event_queue.h
event_scheduler.cc
5.2 merge.
2012-08-22 16:45:25 +02:00
event_scheduler.h
events.cc
events.h
field.cc
MDEV-4667 DATE('string') incompability between mysql and mariadb
2013-07-03 09:46:20 +02:00
field.h
MDEV-4863 COALESCE(time_or_datetime) returns wrong results in numeric context
2013-09-09 15:32:25 +04:00
field_conv.cc
MDEV-4667 DATE('string') incompability between mysql and mariadb
2013-07-03 09:46:20 +02:00
filesort.cc
MDEV-4667 DATE('string') incompability between mysql and mariadb
2013-07-03 09:46:20 +02:00
frm_crypt.cc
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
GIS issues fixed.
2011-12-16 10:21:46 +04: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
Merge with 5.2.
2011-12-11 11:34:44 +02:00
gstream.h
ha_ndbcluster.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
ha_ndbcluster.h
ha_ndbcluster_binlog.cc
5.2->5.3 merge
2013-01-10 15:40:21 +01:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
ha_partition.h
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
2012-11-09 10:11:20 +02:00
handler.cc
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
2012-11-09 10:11:20 +02:00
handler.h
Automatic merge
2012-03-28 13:58:14 +03:00
hash_filo.cc
hash_filo.h
hostname.cc
mysql-5.1.67 merge
2013-01-09 23:51:51 +01:00
init.cc
item.cc
Fixed bug mdev-5078.
2013-10-04 09:51:07 -07:00
item.h
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_buff.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
item_cmpfunc.cc
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_cmpfunc.h
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_create.cc
5.2 merge
2013-03-26 19:09:47 +01:00
item_create.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
item_func.cc
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_func.h
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_geofunc.cc
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_geofunc.h
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_row.cc
The problem was that expression with field after transformation (on the first execution)
2013-01-25 16:56:57 +02:00
item_row.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
item_strfunc.cc
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_strfunc.h
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_subselect.cc
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
2012-11-09 10:11:20 +02:00
item_subselect.h
- Merged the fix for bug lp:1009187, mdev-373.
2012-09-17 11:13:46 +03:00
item_sum.cc
MDEV-4290:
2013-05-03 16:07:13 +03:00
item_sum.h
Rolled back the patch for bug 791761.
2012-02-26 00:19:07 -08:00
item_timefunc.cc
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_timefunc.h
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_xmlfunc.cc
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
item_xmlfunc.h
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
key.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
lex.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
lex_symbol.h
lock.cc
Fixed lp:963603 "Assertion `lock_type != TL_UNLOCK && (lock_type == TL_IGNORE || file->lock.type == TL_UNLOCK)' failed in ha_maria::store_lock with DML, triggers, views"
2012-03-26 13:29:45 +03:00
log.cc
5.2->5.3 merge
2013-01-10 15:40:21 +01:00
log.h
Merge MariaDB 5.2->5.3
2012-11-20 13:57:49 +01:00
log_event.cc
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
log_event.h
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
log_event_old.cc
merge from 5.2
2012-08-24 14:02:32 +02:00
log_event_old.h
merge from 5.2
2012-08-24 14:02:32 +02:00
log_slow.h
Makefile.am
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
mem_root_array.h
Backport 5.5=>5.1 Patch for Bug#13805127:
2012-04-18 13:14:05 +02:00
message.h
message.mc
message.rc
mf_iocache.cc
MSG00001.bin
multi_range_read.cc
MDEV-4244 [PATCH] Buffer overruns and use-after-free errors
2013-04-06 15:51:08 +02:00
multi_range_read.h
my_decimal.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
my_decimal.h
merge
2012-04-05 23:07:18 +02:00
my_lock.c
mysql_install_db.cc
MDEV-221 - Properly escape command line when starting mysql_install_db
2012-04-16 15:28:33 +02:00
mysql_priv.h
MDEV-4863 COALESCE(time_or_datetime) returns wrong results in numeric context
2013-09-09 15:32:25 +04:00
mysql_upgrade_service.cc
mysqld.cc
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_index_cond_pushdown.cc
Backport of:
2012-02-16 20:15:57 +04:00
opt_range.cc
5.2 merge
2013-04-11 19:35:39 +02:00
opt_range.h
MDEV-4240: mariadb 5.3.12 using more memory than MySQL 5.1 for an inefficient query
2013-04-01 18:03:14 +04:00
opt_range_mrr.cc
opt_subselect.cc
MDEV-5011: ERROR Plugin 'MEMORY' has ref_count=1 after shutdown for SJM queries
2013-09-12 13:53:13 +04:00
opt_subselect.h
MDEV-5011: ERROR Plugin 'MEMORY' has ref_count=1 after shutdown for SJM queries
2013-09-12 13:53:13 +04:00
opt_sum.cc
Merge 5.2->5.3
2012-05-11 11:40:23 +03:00
opt_table_elimination.cc
parse_file.cc
LPBUG#983285 - incompatibility in frm in case of VIEWs with non-default ALGORITHM option.
2012-04-20 21:09:16 +02:00
parse_file.h
LPBUG#983285 - incompatibility in frm in case of VIEWs with non-default ALGORITHM option.
2012-04-20 21:09:16 +02:00
partition_element.h
partition_info.cc
partition_info.h
password.c
Bug #13934049 : 64884: LOGINS WITH INCORRECT PASSWORD ARE ALLOWED
2012-04-06 12:04:07 +03:00
plistsort.c
procedure.cc
procedure.h
protocol.cc
5.2 merge.
2012-08-22 16:45:25 +02:00
protocol.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
records.cc
Bug#14051002 VALGRIND: CONDITIONAL JUMP OR MOVE IN RR_CMP / MY_QSORT
2012-06-05 15:53:39 +02:00
repl_failsafe.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
repl_failsafe.h
rpl_constants.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc
rpl_injector.h
rpl_mi.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
rpl_mi.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
rpl_record.cc
Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11"
2012-03-13 16:38:43 +02:00
rpl_record.h
Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11"
2012-03-13 16:38:43 +02:00
rpl_record_old.cc
Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11"
2012-03-13 16:38:43 +02:00
rpl_record_old.h
Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11"
2012-03-13 16:38:43 +02:00
rpl_reporting.cc
rpl_reporting.h
rpl_rli.cc
5.2 merge.
2012-08-22 16:45:25 +02:00
rpl_rli.h
5.2 merge.
2012-08-22 16:45:25 +02:00
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
5.2 merge.
2012-08-22 16:45:25 +02:00
rpl_utility.h
merge with MySQL 5.1.65
2012-08-22 11:40:39 +02:00
scheduler.cc
Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.
2012-02-01 15:48:02 -08:00
scheduler.h
set_var.cc
bug#11761752: DO NOT ALLOW USE OF ALTERNATE DATA STREAMS ON NTFS FILESYSTEM.
2012-12-13 20:33:44 +05:30
set_var.h
signal_handler.cc
5.2 merge
2012-05-20 14:57:29 +02:00
slave.cc
5.2 merge
2013-04-11 19:35:39 +02:00
slave.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc
5.2->5.3 merge
2013-01-10 15:40:21 +01:00
sp_head.h
merge
2012-04-05 12:01:52 +02:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
Merge 5.2->5.3
2013-08-15 14:04:20 -07:00
spatial.h
Merge 5.2->5.3
2013-08-15 14:04:20 -07:00
sql_acl.cc
5.2 merge
2013-05-20 11:13:07 +02:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc
MDEV-4316 MariaDB server crash with signal 11
2013-04-06 15:14:46 +02:00
sql_binlog.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
sql_cache.h
Fixed typos in Query Cache.
2012-02-03 16:56:12 +02:00
sql_class.cc
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
sql_class.h
MDEV-4123 fix.
2013-02-11 10:55:58 +02:00
sql_client.cc
sql_connect.cc
5.2->5.3 merge
2013-01-10 15:40:21 +01:00
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
Fixed bug mdev-5028.
2013-10-02 17:59:56 -07:00
sql_cursor.h
sql_db.cc
5.2->5.3 merge
2013-01-10 15:40:21 +01:00
sql_delete.cc
Merge MariaDB 5.2->5.3
2012-11-20 13:57:49 +01:00
sql_derived.cc
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
sql_do.cc
sql_error.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
sql_error.h
sql_expression_cache.cc
sql_expression_cache.h
sql_handler.cc
Speedup:
2012-03-23 18:22:39 +02:00
sql_handler.h
sql_help.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
sql_insert.cc
5.2 merge
2013-01-28 09:12:23 +01:00
sql_join_cache.cc
Fix typo (clang issued warning that =+ was used where += was intended)
2013-03-06 22:22:24 +01:00
sql_join_cache.h
Counters for Index Condition Pushdown added (MDEV-130).
2012-02-16 08:49:10 +02:00
sql_lex.cc
MDEV-5005: Subquery in Procedure somehow affecting temporary table
2013-09-12 17:05:29 +03:00
sql_lex.h
MDEV-4290:
2013-05-03 16:07:13 +03:00
sql_lifo_buffer.h
sql_list.cc
sql_list.h
Fixed bug mdev-3913.
2013-02-20 18:01:36 -08:00
sql_load.cc
BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIER
2012-09-22 17:50:51 +05:30
sql_locale.cc
sql_manager.cc
Fix embedded/windows tests- move COND_manager and LOCK_manager to sql_manager.cc, to prevent race condition that results into accessing already destroyed critical section
2012-01-02 23:52:31 +01:00
sql_map.cc
sql_map.h
sql_olap.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
sql_parse.cc
5.2 merge
2013-01-25 10:20:45 +01:00
sql_partition.cc
sql_partition.h
sql_plugin.cc
Fixed lp:886479 "[PATCH] plugin boolean result"
2012-04-02 11:45:07 +03:00
sql_plugin.h
sql_plugin_services.h
sql_prepare.cc
5.2 merge
2013-05-20 11:13:07 +02:00
sql_profile.cc
5.2->5.3 merge
2013-01-10 15:40:21 +01:00
sql_profile.h
mysql-5.1.67 merge
2013-01-09 23:51:51 +01:00
sql_rename.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
sql_repl.cc
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
sql_repl.h
sql_select.cc
Fixed bug mdev-5028.
2013-10-02 17:59:56 -07:00
sql_select.h
Fixed bug mdev-5028.
2013-10-02 17:59:56 -07:00
sql_servers.cc
sql_servers.h
sql_show.cc
Merge from 5.2
2013-07-09 11:02:56 +04:00
sql_show.h
MDEV-495 backport --ignore-db-dir.
2012-09-27 13:18:07 +05:00
sql_sort.h
sql_state.c
sql_string.cc
merge from 5.2
2012-08-24 14:02:32 +02:00
sql_string.h
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
2012-11-09 10:11:20 +02:00
sql_table.cc
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
sql_tablespace.cc
sql_test.cc
Merge with 5.2.
2011-12-11 11:34:44 +02:00
sql_trigger.cc
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
sql_trigger.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
sql_udf.cc
sql_udf.h
sql_union.cc
fix for MDEV-367
2012-08-25 09:15:57 +03:00
sql_update.cc
MDEV-4123 fix.
2013-02-11 10:55:58 +02:00
sql_view.cc
LPBUG#983285 - incompatibility in frm in case of VIEWs with non-default ALGORITHM option.
2012-04-20 21:09:16 +02:00
sql_view.h
sql_yacc.yy
MDEV-438 Microseconds: Precision is ignored in CURRENT_TIMESTAMP(N) when it is given as a default column value
2012-08-29 18:36:57 +02:00
strfunc.cc
structs.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
table.cc
Merge 5.2->5.3
2013-08-15 14:04:20 -07:00
table.h
MDEV-5039: incorrect Item_func_regex::update_used_tables()
2013-09-25 15:30:13 +03:00
thr_malloc.cc
time.cc
MDEV-4667 DATE('string') incompability between mysql and mariadb
2013-07-03 09:46:20 +02:00
tzfile.h
tztime.cc
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
tztime.h
Merge with 5.2.
2011-12-11 11:34:44 +02:00
udf_example.c
udf_example.def
uniques.cc
Merge 5.2->5.3
2013-01-21 21:29:19 -08:00
unireg.cc
Merge 5.2->5.3
2012-06-23 15:00:05 -07:00
unireg.h
Merge 5.2->5.3
2012-06-23 15:00:05 -07:00
winservice.c
LP952607: Do not show MySQL services preinstalled by Dell in the upgrade wizard
2012-03-12 12:14:04 +01:00
winservice.h