..
examples
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-17 15:54:01 +02:00
share
merged
2010-03-15 12:51:23 +01:00
.cvsignore
add_errmsg
authors.h
This is based on the userstatv2 patch from Percona and OurDelta.
2009-10-19 20:14:48 +03:00
client_settings.h
Bug#46013: rpl_extraColmaster_myisam fails on pb2
2009-08-13 17:07:20 -03:00
CMakeLists.txt
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
contributors.h
custom_conf.h
debug_sync.cc
Fixed a valgrind error in debug_sync
2009-10-04 12:53:02 +03:00
debug_sync.h
WL#4259 - Debug Sync Facility
2009-09-29 17:38:40 +02:00
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc
merged
2010-03-15 12:51:23 +01:00
event_data_objects.h
Bug#35997 Event scheduler seems to let the server crash, if it is embedded.
2008-05-09 09:43:02 +02:00
event_db_repository.cc
merged
2010-03-15 12:51:23 +01:00
event_db_repository.h
event_parse_data.cc
Bug#29125 Windows Server X64: so many compiler warnings
2009-02-13 11:41:47 -05:00
event_parse_data.h
Added "Sun Microsystems, Inc." to copyright headers on files modified
2008-11-10 21:21:49 +01:00
event_queue.cc
WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_deadlock_detector)
2008-12-03 00:02:52 +02:00
event_queue.h
event_scheduler.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
event_scheduler.h
events.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
events.h
field.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
field.h
merged
2010-03-15 12:51:23 +01:00
field_conv.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-17 15:54:01 +02:00
filesort.cc
merged
2010-03-15 12:51:23 +01:00
frm_crypt.cc
gen_lex_hash.cc
Bug#29125 Windows Server X64: so many compiler warnings
2009-02-13 11:41:47 -05:00
gstream.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-06-09 18:11:21 +02:00
gstream.h
ha_ndbcluster.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
ha_ndbcluster.h
Backport into MariaDB-5.2 the following:
2009-12-15 20:23:55 +03:00
ha_ndbcluster_binlog.cc
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
fixed warnings and compile errors from the fix for bug 26243
2008-03-29 09:52:16 +02:00
ha_ndbcluster_cond.h
Merge mysql.com:/misc/mysql/34749/50-34749
2008-03-10 07:07:56 +01:00
ha_ndbcluster_tables.h
ha_partition.cc
merged
2010-03-15 12:51:23 +01:00
ha_partition.h
merged
2010-03-15 12:51:23 +01:00
handler.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
handler.h
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
hash_filo.cc
hash_filo.h
hostname.cc
We are now using Valgrind rather than purify, and have for quite some time.
2009-05-06 14:03:24 +02:00
init.cc
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294
2008-04-03 13:14:57 -04:00
item.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
item.h
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
item_buff.cc
Subquery optimizations: non-semijoin materialization
2010-01-28 16:48:33 +03:00
item_cmpfunc.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
item_cmpfunc.h
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
item_create.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
item_create.h
item_func.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
item_func.h
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
item_geofunc.cc
Manual merge of the fix for bug#43668.
2009-11-24 18:26:13 +03:00
item_geofunc.h
Fix for Bug#30217: Views: changes in metadata behaviour
2008-02-22 13:30:33 +03:00
item_row.cc
Backport of subquery optimizations to 5.3.
2010-01-17 17:51:10 +03:00
item_row.h
Backport of subquery optimizations to 5.3.
2010-01-17 17:51:10 +03:00
item_strfunc.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
item_strfunc.h
merged
2010-03-15 12:51:23 +01:00
item_subselect.cc
MWL#68: Subquery optimization: Efficient NOT IN execution with NULLs
2010-04-02 17:27:06 +03:00
item_subselect.h
MWL#110: Make EXPLAIN always show materialization separately
2010-03-29 18:04:35 +04:00
item_sum.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
item_sum.h
merge 5.1->5.2
2010-02-01 08:14:12 +02:00
item_timefunc.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
item_timefunc.h
merged
2010-03-15 12:51:23 +01:00
item_xmlfunc.cc
merge 5.1->5.2
2010-02-01 08:14:12 +02:00
item_xmlfunc.h
The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.
2009-10-16 15:57:48 -07:00
key.cc
Bug#37721: ORDER BY when WHERE contains non-partitioned
2008-10-10 12:01:01 +02:00
lex.h
Merge of the patch introducing virtual columns into maria-5.2
2009-11-11 20:31:28 -08:00
lex_symbol.h
lock.cc
When one does a drop table, the indexes are not flushed to disk before drop anymore (with MyISAM/Maria)
2010-02-10 21:06:24 +02:00
log.cc
merged
2010-03-15 12:51:23 +01:00
log.h
merged
2010-03-15 12:51:23 +01:00
log_event.cc
merged
2010-03-15 12:51:23 +01:00
log_event.h
merged
2010-03-15 12:51:23 +01:00
log_event_old.cc
merged
2010-03-15 12:51:23 +01:00
log_event_old.h
BUG#31583 (5.1-telco-6.1 -> 5.1.22. Slave returns Error in unknown event):
2007-12-05 20:00:14 +01:00
log_slow.h
Updated documentation files to reflect MariaDB and not the Maria storage engine or MySQL
2009-09-03 17:05:38 +03:00
Makefile.am
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
message.h
Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.
2008-10-23 15:28:53 +02:00
message.mc
Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.
2008-10-23 15:28:53 +02:00
message.rc
Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.
2008-10-23 15:28:53 +02:00
mf_iocache.cc
MSG00001.bin
Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.
2008-10-23 15:28:53 +02:00
multi_range_read.cc
MWL#67: MRR backport
2009-12-22 15:33:21 +03:00
multi_range_read.h
MWL#67: MRR backport
2009-12-22 15:33:21 +03:00
my_decimal.cc
Changed -1 row number in some warnings to 0
2009-12-06 19:26:12 +02:00
my_decimal.h
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
my_lock.c
Fixed bug in undo_key_delete; Caused crashed key files in recovery
2007-12-17 01:17:37 +02:00
mysql_priv.h
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
mysqld.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
mysqld_suffix.h
net_serv.cc
fix for a possible DoS in the my_net_skip_rest()
2010-02-23 13:04:58 +01:00
nt_servc.cc
merge
2008-11-22 01:10:38 +01:00
nt_servc.h
merge
2008-11-22 01:10:38 +01:00
opt_index_cond_pushdown.cc
Merge MWL#67: MRR Backport and BKA backport.
2009-12-22 15:49:15 +03:00
opt_range.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
opt_range.h
MWL#67: MRR backport
2009-12-22 15:33:21 +03:00
opt_range_mrr.cc
MWL#67: MRR backport
2009-12-22 15:33:21 +03:00
opt_subselect.cc
Merge in MWL#68: Subquery optimization: Efficient NOT IN execution with NULLs
2010-03-15 21:52:58 +02:00
opt_subselect.h
Subquery optimization backport:
2010-02-16 00:53:06 +03:00
opt_sum.cc
merge 5.1-> 5.2
2009-12-08 23:47:54 +02:00
opt_table_elimination.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
parse_file.cc
Bug#44834 strxnmov is expected to behave as you'd expect
2009-06-19 13:24:43 +05:00
parse_file.h
Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist(addon)
2009-04-13 18:09:10 +05:00
partition_element.h
partition_info.cc
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
partition_info.h
fixed a valgrind warning in partition_pruning
2009-09-02 18:42:08 +03:00
password.c
Merge MySQL->MariaDB
2009-09-08 00:50:10 +04:00
procedure.cc
procedure.h
The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.
2009-10-16 15:57:48 -07:00
protocol.cc
Merge MySQL->MariaDB
2009-09-08 00:50:10 +04:00
protocol.h
Merge MySQL->MariaDB
2009-09-08 00:50:10 +04:00
records.cc
merge 5.1-> 5.2
2009-12-08 23:47:54 +02:00
repl_failsafe.cc
Bug#49501 Inefficient information_schema check (system collation), addon
2010-01-22 14:58:21 +04:00
repl_failsafe.h
rpl_constants.h
BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event
2008-12-29 17:04:10 +01:00
rpl_filter.cc
merge 5.1-> 5.2
2009-12-08 23:47:54 +02:00
rpl_filter.h
MWL#36: Add a mysqlbinlog option to change the used database
2009-10-24 23:43:39 +04:00
rpl_injector.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
rpl_injector.h
Fixed compiler warnings in a lot of files
2008-02-13 21:27:12 +02:00
rpl_mi.cc
Merge latest XtraDB from lp:percona-xtradb into MariaDB.
2009-06-11 14:53:26 +02:00
rpl_mi.h
rpl_record.cc
Fix for compiler warnings:
2010-01-28 19:51:40 -02:00
rpl_record.h
BUG#48091 valgrind errors when slave has double not null and master has double null
2009-10-22 01:15:45 +01:00
rpl_record_old.cc
rpl_record_old.h
rpl_reporting.cc
BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind
2009-06-16 16:04:30 +01:00
rpl_reporting.h
BUG#45511 rpl.rpl_binlog_corruption fails with warning messages in Valgrind
2009-06-16 16:04:30 +01:00
rpl_rli.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
rpl_rli.h
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
rpl_tblmap.cc
Bug#45613 handle failures from my_hash_insert
2009-11-20 16:18:01 +01:00
rpl_tblmap.h
Bug#31455 mysqlbinlog don't print user readable info about RBR events
2008-08-20 19:06:31 +05:00
rpl_utility.cc
BUG#37426: RBR breaks for CHAR() UTF-8 fields > 85 chars
2008-06-30 22:11:18 +02:00
rpl_utility.h
Bug#48776 row based replication breaks with spatial / geometry types, cause crashes!
2010-01-05 14:25:29 +08:00
scheduler.cc
Added protection around usage of thd->mysys_var
2009-11-26 22:19:33 +02:00
scheduler.h
Added mariadb and mariadb-version as my.conf option tags
2009-03-18 04:14:22 +02:00
set_var.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
set_var.h
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
slave.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
slave.h
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
sp.cc
merged
2010-03-15 12:51:23 +01:00
sp.h
Bug#45613 handle failures from my_hash_insert
2009-11-20 16:18:01 +01:00
sp_cache.cc
Merge with MySQL 5.1.42
2010-01-15 17:27:55 +02:00
sp_cache.h
WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_deadlock_detector)
2008-12-03 00:02:52 +02:00
sp_head.cc
merged
2010-03-15 12:51:23 +01:00
sp_head.h
Bug#45613 handle failures from my_hash_insert
2009-11-20 16:18:01 +01:00
sp_pcontext.cc
merging
2009-04-29 07:59:10 +05:00
sp_pcontext.h
Manual merge.
2009-12-18 16:44:24 -02:00
sp_rcontext.cc
Bug#34384: Slow down on constant conversion.
2009-11-06 22:34:25 +03:00
sp_rcontext.h
Bug#33618 (Crash in sp_rcontext)
2008-01-23 13:26:41 -07:00
spatial.cc
Merge MySQL 5.1.39 into MariaDB 5.1.
2009-10-15 23:38:29 +02:00
spatial.h
Merge from 5.0-bugteam
2009-06-17 16:56:44 +02:00
sql_acl.cc
merged
2010-03-15 12:51:23 +01:00
sql_acl.h
Bug#41726: upgrade from 5.0 to 5.1.30 crashes if you didn't run mysql_upgrade
2009-11-21 09:18:21 -02:00
sql_analyse.cc
Merge from 5.0-bugteam
2009-06-17 16:56:44 +02:00
sql_analyse.h
Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
2008-03-21 17:48:28 +02:00
sql_array.h
Backport of subquery optimizations to 5.3.
2010-01-17 17:51:10 +03:00
sql_base.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
sql_binlog.cc
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
sql_bitmap.h
MWL#17: Table elimination
2009-08-13 02:34:21 +04:00
sql_builtin.cc.in
Remove compiler warnings (Including some warnings from -Wstrict-aliasing)
2009-11-30 01:08:56 +02:00
sql_cache.cc
Changed version number from RC to stable
2010-01-29 12:42:31 +02:00
sql_cache.h
Bug#39253 Large query cache still freezes server after fix for bug #21074
2009-11-20 13:49:06 +01:00
sql_class.cc
Fixed a problem where the temp table of a materialized subquery
2010-04-06 00:15:15 +03:00
sql_class.h
Fixed a problem where the temp table of a materialized subquery
2010-04-06 00:15:15 +03:00
sql_client.cc
sql_connect.cc
merged
2010-03-15 12:51:23 +01:00
sql_crypt.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_crypt.h
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_cursor.cc
Subquery optimizations backport: fix test failures, update test results.
2010-02-18 00:59:41 +03:00
sql_cursor.h
sql_db.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_delete.cc
Automatic merge
2010-03-10 15:55:40 +02:00
sql_derived.cc
Subquery optimizations backport: fix test failures, update test results.
2010-02-18 00:59:41 +03:00
sql_do.cc
Rename send_ok to my_ok. Similarly to my_error, it only records the status,
2008-02-19 15:45:21 +03:00
sql_error.cc
Bug#29125 Windows Server X64: so many compiler warnings
2009-02-13 11:41:47 -05:00
sql_error.h
sql_handler.cc
merge 5.1-> 5.2
2009-12-08 23:47:54 +02:00
sql_help.cc
This is based on the userstatv2 patch from Percona and OurDelta.
2009-10-19 20:14:48 +03:00
sql_insert.cc
merged
2010-03-15 12:51:23 +01:00
sql_join_cache.cc
BUG#49129: Wrong result with IN-subquery with join_cache_level=6 and firstmatch=off
2010-03-07 18:41:45 +03:00
sql_lex.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
sql_lex.h
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
sql_list.cc
sql_list.h
Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge
2009-09-15 14:46:35 +04:00
sql_load.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_locale.cc
Bug#43207 wrong LC_TIME names for romanian locale
2009-10-19 13:41:52 +05:00
sql_manager.cc
Bug#38522: 5 seconds delay when closing application using embedded server
2008-12-04 19:41:53 +01:00
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
sql_partition.cc
merged
2010-03-15 12:51:23 +01:00
sql_partition.h
Bug #42849 : innodb crash with varying time_zone on partitioned
2009-12-13 23:29:50 +03:00
sql_plugin.cc
merged
2010-03-15 12:51:23 +01:00
sql_plugin.h
merged
2010-03-15 12:51:23 +01:00
sql_plugin_services.h
mwl:98 - libservices
2010-03-03 15:44:14 +01:00
sql_prepare.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
sql_profile.cc
Patch set contributed by Alex Budovski (MCA)
2010-01-29 20:42:22 +02:00
sql_profile.h
Patch set contributed by Alex Budovski (MCA)
2010-01-29 20:42:22 +02:00
sql_rename.cc
Backport Bug#37148 to 5.1
2010-01-24 15:03:23 +08:00
sql_repl.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_repl.h
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
2008-03-14 18:38:54 +01:00
sql_select.cc
Fix buildbot compile failure on hardy-amd64-makedist:
2010-03-30 00:09:40 +04:00
sql_select.h
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
sql_servers.cc
merged
2010-03-15 12:51:23 +01:00
sql_servers.h
sql_show.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
sql_show.h
Added "Sun Microsystems, Inc." to copyright headers on files modified
2008-11-10 21:21:49 +01:00
sql_sort.h
sql_state.c
sql_string.cc
MWL#36: Add a mysqlbinlog option to change the used database
2009-10-24 23:43:39 +04:00
sql_string.h
MWL#36: Add a mysqlbinlog option to change the used database
2009-10-24 23:43:39 +04:00
sql_table.cc
merged
2010-03-15 12:51:23 +01:00
sql_tablespace.cc
Merge MySQL 5.1.44 into MariaDB.
2010-03-04 09:03:07 +01:00
sql_test.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
sql_trigger.cc
Backport Bug#37148 to 5.1
2010-01-24 15:03:23 +08:00
sql_trigger.h
Fix for
2009-01-14 18:50:51 +04:00
sql_udf.cc
merged
2010-03-15 12:51:23 +01:00
sql_udf.h
sql_union.cc
Fixed a problem where the temp table of a materialized subquery
2010-04-06 00:15:15 +03:00
sql_update.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
sql_view.cc
Backport Bug#37148 to 5.1
2010-01-24 15:03:23 +08:00
sql_view.h
Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist(addon)
2009-04-13 18:09:10 +05:00
sql_yacc.yy
merged
2010-03-15 12:51:23 +01:00
strfunc.cc
Bug #43414 Parenthesis (and other) warnings compiling MySQL
2009-09-23 15:21:29 +02:00
structs.h
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
table.cc
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
table.h
Merge MariaDB-5.2 -> MariaDB 5.3
2010-03-20 15:01:47 +03:00
thr_malloc.cc
MWL#36: Add a mysqlbinlog option to change the used database.
2009-10-16 15:20:09 +04:00
time.cc
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
tzfile.h
tztime.cc
This is based on the userstatv2 patch from Percona and OurDelta.
2009-10-19 20:14:48 +03:00
tztime.h
Backport of a 5.0.74 fix into 5.0.72sp1:
2009-01-12 17:40:29 +01:00
udf_example.c
Merge with MySQL 5.1, with following additions:
2009-11-16 21:49:51 +01:00
udf_example.def
Patch set contributed by Alex Budovski (MCA)
2010-01-29 20:42:22 +02:00
uniques.cc
Merge from 5.0-bugteam
2009-06-17 16:56:44 +02:00
unireg.cc
merge 5.1-> 5.2
2009-12-08 23:47:54 +02:00
unireg.h
The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.
2009-10-16 15:57:48 -07:00