mariadb/sql
Vladislav Vaintroub f16fea29ee merge
2009-12-21 18:38:45 +01:00
..
examples
share merge 2009-12-19 14:11:48 +01:00
add_errmsg
authors.h
client_settings.h Backport of WL#798 (MySQL IPv6 support) from 6.0. 2009-11-25 13:53:23 +03:00
CMakeLists.txt Simplify embedding version info into executables with ADD_VERSION_INFO 2009-12-18 23:53:30 +01:00
contributors.h
custom_conf.h
debug_sync.cc WL#2360 Performance schema 2009-12-09 20:19:51 -07:00
debug_sync.h
derror.cc Backport of: 2009-11-24 16:54:59 +03:00
des_key_file.cc Backport of: 2009-11-24 16:54:59 +03:00
discover.cc Backport of: 2009-11-24 16:54:59 +03:00
event_data_objects.cc Manual merge of mysql-next-mr-runtime upstream. 2009-11-19 21:48:08 -02:00
event_data_objects.h
event_db_repository.cc 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
event_db_repository.h
event_parse_data.cc
event_parse_data.h
event_queue.cc
event_queue.h
event_scheduler.cc Merge 2009-12-14 17:08:30 +01:00
event_scheduler.h
events.cc Auto merge 2009-11-21 12:48:54 +08:00
events.h
field.cc Manual merge from mysql-trunk-merge. 2009-12-12 23:38:59 +03:00
field.h Manual merge from mysql-trunk-merge. 2009-12-12 23:38:59 +03:00
field_conv.cc
filesort.cc Backport of: 2009-11-24 16:54:59 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc Merge cleanup 2009-12-11 12:45:44 -07:00
ha_ndbcluster.h
ha_ndbcluster_binlog.cc Merge cleanup 2009-12-11 12:45:44 -07:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc Backport of: 2009-11-24 16:54:59 +03:00
ha_partition.h merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 2009-11-06 18:35:04 +02:00
handler.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2009-12-03 23:46:06 +03:00
handler.h Merge mysql-next-mr to mysql-next-mr-svoj. 2009-12-09 15:03:34 +04:00
hash_filo.cc
hash_filo.h
hostname.cc Backport of WL#798 (MySQL IPv6 support) from 6.0. 2009-11-25 13:53:23 +03:00
init.cc Backport of: 2009-11-24 16:54:59 +03:00
item.cc Post-merge fix. 2009-12-14 17:17:41 +03:00
item.h Auto-merge from mysql-next-mr. 2009-12-19 11:35:19 +03:00
item_buff.cc
item_cmpfunc.cc Auto-merge from mysql-trunk-merge. 2009-12-16 21:37:10 +03:00
item_cmpfunc.h Auto-merge from mysql-trunk-merge. 2009-12-16 21:37:10 +03:00
item_create.cc Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
item_create.h
item_func.cc Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc 2009-12-16 15:48:55 -07:00
item_func.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-16 16:47:07 +03:00
item_geofunc.cc Manual merge of the fix for bug#43668. 2009-11-24 18:26:13 +03:00
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Manual merge from mysql-trunk-merge. 2009-12-16 21:02:21 +03:00
item_strfunc.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-11 19:40:58 +03:00
item_subselect.cc Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
item_subselect.h Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
item_sum.cc Post-merge fix. 2009-12-14 17:17:41 +03:00
item_sum.h Manual merge from mysql-trunk-merge. 2009-12-12 23:38:59 +03:00
item_timefunc.cc Manual merge from mysql-trunk-merge. 2009-12-16 21:02:21 +03:00
item_timefunc.h Auto-merge from mysql-next-mr. 2009-12-19 11:35:19 +03:00
item_xmlfunc.cc Bug#34384: Slow down on constant conversion. 2009-11-06 22:34:25 +03:00
item_xmlfunc.h
key.cc
lex.h Manual resolving for the following files 2009-12-01 21:07:18 +02:00
lex_symbol.h
lock.cc Merge cleanup 2009-12-11 12:45:44 -07:00
log.cc Manual merge from mysql-trunk-merge. 2009-12-17 22:16:54 +03:00
log.h Manual merge from mysql-trunk-merge. 2009-12-16 21:02:21 +03:00
log_event.cc Auto-merge from mysql-next-mr-summit0.3. 2009-12-16 21:50:45 +03:00
log_event.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-16 16:47:07 +03:00
log_event_old.cc merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw 2009-11-30 14:34:39 +02:00
log_event_old.h
main.cc Introduce a workaround for Solaris' inability to deal with dtrace in static libraries. 2009-12-11 15:51:39 +01:00
Makefile.am Introduce a workaround for Solaris' inability to deal with dtrace in static libraries. 2009-12-11 15:51:39 +01:00
message.h
message.mc
message.rc
mf_iocache.cc
MSG00001.bin
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc 2009-12-17 02:12:02 -07:00
mysql_priv.h.pp
mysqld.cc merge 2009-12-19 14:11:48 +01:00
mysqld_suffix.h
net_serv.cc WL#4949, Remove use of LOCK_alarm by instead using SO_SNDTIME0/SO_RCVTIME0 2009-11-12 12:17:31 +01:00
nt_servc.cc WL#5161 : Cross-platform build with CMake 2009-11-09 12:32:48 +01:00
nt_servc.h
opt_range.cc Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
opt_range.h Backport of: 2009-11-24 16:54:59 +03:00
opt_sum.cc Backport of Bug#15192 to mysql-next-mr 2009-11-10 18:31:28 -02:00
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc BUG#49591, Fixed version string in SHOW CREATE TABLE to accomodate for column list partitioning and new function to_seconds 2009-12-17 18:39:10 +01:00
partition_info.h BUG#49591, Fixed version string in SHOW CREATE TABLE to accomodate for column list partitioning and new function to_seconds 2009-12-17 18:39:10 +01:00
password.c
procedure.cc
procedure.h
protocol.cc merge (and including the fix for bug#48939 since that was not included in mysql-trunk-bugfixing). 2009-12-15 23:47:04 +01:00
protocol.h
records.cc Backport of: 2009-11-24 16:54:59 +03:00
records.h Manual merge from mysql-trunk-merge. 2009-11-06 19:13:33 +03:00
repl_failsafe.cc Manual merge from mysql-trunk-merge. 2009-12-12 23:38:59 +03:00
repl_failsafe.h
replication.h WL#2360 Performance schema 2009-12-09 20:19:51 -07:00
rpl_constants.h
rpl_filter.cc
rpl_filter.h
rpl_handler.cc Auto merge from 5.1-rep-semisync 2009-12-05 10:28:53 +08:00
rpl_handler.h
rpl_injector.cc BUG#37148 Most callers of mysql_bin_log.write ignore the return result 2009-11-21 12:28:01 +08:00
rpl_injector.h
rpl_mi.cc BUG#48048: Deprecated constructs need removal in Betony 2009-11-04 12:28:20 +00:00
rpl_mi.h BUG#48048: Deprecated constructs need removal in Betony 2009-11-04 12:28:20 +00:00
rpl_record.cc
rpl_record.h
rpl_record_old.cc
rpl_record_old.h
rpl_reporting.cc
rpl_reporting.h
rpl_rli.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-16 16:47:07 +03:00
rpl_rli.h Manual merge from mysql-trunk-merge. 2009-12-16 21:02:21 +03:00
rpl_tblmap.cc Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
scheduler.cc
scheduler.h
set_var.cc Manual merge from mysql-trunk-merge. 2009-12-17 22:16:54 +03:00
set_var.h Manual resolving for the following files 2009-12-01 21:07:18 +02:00
slave.cc Auto-merge from mysql-next-mr-summit0.3. 2009-12-16 21:50:45 +03:00
slave.h Backport of: 2009-11-23 19:57:31 +03:00
sp.cc Manual merge from mysql-trunk-merge. 2009-12-16 21:02:21 +03:00
sp.h Bug#45613 handle failures from my_hash_insert 2009-11-20 16:18:01 +01:00
sp_cache.cc Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc 2009-12-16 15:48:55 -07:00
sp_cache.h
sp_head.cc Merge to latest mysql-next-mr 2009-12-16 09:49:16 +01:00
sp_head.h Bug#45613 handle failures from my_hash_insert 2009-11-20 16:18:01 +01:00
sp_pcontext.cc Backport of: 2009-11-24 16:54:59 +03:00
sp_pcontext.h
sp_rcontext.cc Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Manual merge from mysql-trunk-merge. 2009-12-16 21:02:21 +03:00
sql_acl.h Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Manual merge from mysql-next-mr. 2009-12-17 23:02:52 +03:00
sql_binlog.cc merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 2009-11-06 18:35:04 +02:00
sql_bitmap.h
sql_builtin.cc.in WL#5161 : Cross-platform build with CMake 2009-11-09 12:32:48 +01:00
sql_cache.cc Manual merge from mysql-trunk-merge. 2009-12-12 23:38:59 +03:00
sql_cache.h Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
sql_class.cc Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc 2009-12-17 02:12:02 -07:00
sql_class.h merge 2009-12-19 14:11:48 +01:00
sql_client.cc
sql_connect.cc Backport of WL#798 (MySQL IPv6 support) from 6.0. 2009-11-25 13:53:23 +03:00
sql_crypt.cc Bug#49141: Encode function is significantly slower in 5.1 compared to 5.0 2009-12-04 13:36:58 -02:00
sql_crypt.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-11 19:40:58 +03:00
sql_cursor.cc WL#5138, Fixed according to code review comments from Davi 2009-11-24 14:28:38 +01:00
sql_cursor.h
sql_db.cc Manual merge from mysql-next-mr. 2009-12-17 23:02:52 +03:00
sql_delete.cc Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc 2009-12-16 15:48:55 -07:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc Merge cleanup 2009-12-11 12:45:44 -07:00
sql_help.cc
sql_insert.cc Manual merge from mysql-next-mr. 2009-12-17 23:02:52 +03:00
sql_lex.cc Bug#49165 Remove unused/confusing code/comments in setup_conds() 2009-11-27 15:23:20 +01:00
sql_lex.h Manual merge from mysql-next-mr. 2009-12-02 18:50:14 +03:00
sql_list.cc
sql_list.h Backport of Bug#15192 to mysql-next-mr 2009-11-10 18:31:28 -02:00
sql_load.cc Manual merge from mysql-trunk-merge. 2009-12-12 23:38:59 +03:00
sql_locale.cc Manual-merge from mysql-trunk-merge. 2009-11-06 12:52:45 +03:00
sql_manager.cc
sql_map.cc Backport of: 2009-11-24 16:54:59 +03:00
sql_map.h
sql_olap.cc
sql_parse.cc Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marc 2009-12-17 02:12:02 -07:00
sql_partition.cc Manual merge from mysql-next-mr. 2009-12-17 23:02:52 +03:00
sql_partition.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-16 16:47:07 +03:00
sql_plugin.cc Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc 2009-12-11 01:58:13 -07:00
sql_plugin.h
sql_plugin_services.h
sql_prepare.cc Backport of: 2009-11-23 19:57:31 +03:00
sql_prepare.h
sql_profile.cc
sql_profile.h
sql_rename.cc Merge cleanup 2009-12-11 12:45:44 -07:00
sql_repl.cc Manual merge from mysql-next-mr. 2009-12-02 18:50:14 +03:00
sql_repl.h
sql_select.cc Manual merge from mysql-trunk-merge. 2009-12-17 22:16:54 +03:00
sql_select.h Bug#33546: Slowdown on re-evaluation of constant expressions. 2009-12-02 00:25:51 +03:00
sql_servers.cc Manual merge/pull from mysql-next-mr. 2009-11-25 18:03:05 +03:00
sql_servers.h
sql_show.cc Auto-merge from mysql-next-mr. 2009-12-19 11:35:19 +03:00
sql_show.h
sql_signal.cc
sql_signal.h
sql_sort.h
sql_state.c
sql_string.cc Backport of: 2009-11-24 16:54:59 +03:00
sql_string.h Bug #33544 UDF_INIT member decimals initialized wrong with 2009-11-11 21:19:41 +01:00
sql_table.cc Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc 2009-12-16 15:48:55 -07:00
sql_tablespace.cc BUG#37148 Most callers of mysql_bin_log.write ignore the return result 2009-11-21 12:28:01 +08:00
sql_test.cc Merge cleanup 2009-12-11 12:45:44 -07:00
sql_trigger.cc Merge cleanup 2009-12-11 12:45:44 -07:00
sql_trigger.h
sql_udf.cc Auto merge 2009-11-21 12:48:54 +08:00
sql_udf.h
sql_union.cc
sql_update.cc Manual merge from mysql-trunk-merge. 2009-12-16 21:02:21 +03:00
sql_view.cc Manual merge from mysql-next-mr. 2009-12-17 23:02:52 +03:00
sql_view.h
sql_yacc.yy Auto-merge from mysql-next-mr. 2009-12-19 11:35:19 +03:00
strfunc.cc
structs.h merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw 2009-11-30 14:34:39 +02:00
table.cc Manual merge from mysql-trunk-merge. 2009-12-12 23:38:59 +03:00
table.h Manual merge from mysql-trunk-merge. 2009-12-12 23:38:59 +03:00
thr_malloc.cc
time.cc Manual merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03:00
tzfile.h
tztime.cc Manual merge/pull from mysql-next-mr. 2009-11-25 18:03:05 +03:00
tztime.h
udf_example.c Backport of: 2009-11-24 16:54:59 +03:00
udf_example.def
uniques.cc Backport of: 2009-11-24 16:54:59 +03:00
unireg.cc Backport of: 2009-11-24 16:54:59 +03:00
unireg.h Backport of: 2009-11-23 19:57:31 +03:00