mariadb/sql
Alexey Kopytov 031657c694 Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
2010-02-26 16:06:31 +03:00
..
examples
share Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-26 16:06:31 +03:00
add_errmsg WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
authors.h manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
client_settings.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
CMakeLists.txt WL#4903 Plugin Service API part I 2009-11-02 21:05:42 +01:00
contributors.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
custom_conf.h
debug_sync.cc backport of dbug extensions from 6.0: 2009-10-30 19:13:58 +01:00
debug_sync.h WL#4259 - Debug Sync Facility 2009-09-29 17:38:40 +02:00
derror.cc WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
des_key_file.cc
discover.cc
event_data_objects.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-01-24 00:09:23 +03:00
event_data_objects.h
event_db_repository.cc Bug #49132 Replication failure on temporary table + DDL 2010-01-22 17:38:21 +08:00
event_db_repository.h
event_parse_data.cc
event_parse_data.h
event_queue.cc
event_queue.h
event_scheduler.cc Manual merge from mysql-5.1-bugteam. 2010-02-03 17:01:48 +03:00
event_scheduler.h
events.cc Manual merge from mysql-5.1-bugteam. 2010-02-03 17:01:48 +03:00
events.h
field.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
field.h Manual merge from mysql-5.1-bugteam. 2010-01-30 22:13:36 +03:00
field_conv.cc revert 48525 2010-02-22 16:58:56 +00:00
filesort.cc Manual merge from mysql-5.1-bugteam. 2010-01-30 22:13:36 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
ha_ndbcluster.cc Auto-merge from mysql-next-mr. 2009-11-10 10:31:33 +03:00
ha_ndbcluster.h manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
ha_ndbcluster_binlog.cc Auto-merge from mysql-next-mr. 2009-11-10 10:31:33 +03:00
ha_ndbcluster_binlog.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
ha_ndbcluster_tables.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
ha_partition.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
ha_partition.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-25 13:56:50 +03:00
handler.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2009-12-03 23:46:06 +03:00
handler.h Auto-merge from mysql-trunk-merge. 2009-11-06 12:37:00 +03:00
hash_filo.cc
hash_filo.h Backport of: 2009-10-14 20:37:38 +04:00
hostname.cc Backport of: 2009-10-14 20:37:38 +04:00
init.cc
item.cc Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-26 16:06:31 +03:00
item.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
item_buff.cc
item_cmpfunc.cc merge 5.1-main to 5.1-bugteam 2010-01-13 12:28:42 +02:00
item_cmpfunc.h Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-26 16:06:31 +03:00
item_create.cc Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. 2010-01-15 14:26:53 +03:00
item_create.h
item_func.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-25 13:56:50 +03:00
item_func.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-25 13:56:50 +03:00
item_geofunc.cc Manual merge of the fix for bug#43668. 2009-11-24 18:26:13 +03:00
item_geofunc.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
item_row.cc Bug#48294 assertion when creating a view based on some row() construct in select query 2010-02-12 13:44:20 +04:00
item_row.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
item_strfunc.cc Manual merge from mysql-5.1-bugteam. 2010-01-30 22:13:36 +03:00
item_strfunc.h Manual merge from mysql-5.1-bugteam. 2010-01-30 22:13:36 +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 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-23 16:26:45 +03:00
item_sum.h Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
item_timefunc.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-11 19:40:58 +03:00
item_timefunc.h Auto-merge from mysql-trunk. 2009-12-19 11:33:33 +03:00
item_xmlfunc.cc Bug#34384: Slow down on constant conversion. 2009-11-06 22:34:25 +03:00
item_xmlfunc.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
key.cc WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
lex.h Changed COLUMN_LIST to COLUMNS after arch review 2009-10-29 18:04:23 +01:00
lex_symbol.h
lock.cc Backport of: 2009-10-14 20:37:38 +04:00
log.cc BUG#48632: Fix for Bug #23300 Has Not Been Backported 2010-02-05 17:01:09 +00:00
log.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-11 19:40:58 +03:00
log_event.cc Manual merge from mysql-trunk. 2010-02-23 17:06:06 +03:00
log_event.h Manual merge from mysql-5.1-bugteam. 2010-01-30 22:13:36 +03:00
log_event_old.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-23 16:26:45 +03:00
log_event_old.h
Makefile.am Auto-merge from mysql-next-mr. 2009-11-05 15:08:37 +03:00
message.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
message.mc
message.rc
mf_iocache.cc
MSG00001.bin
my_decimal.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
my_decimal.h Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields when using IF 2009-11-02 09:21:39 -02:00
my_lock.c
mysql_priv.h Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
mysql_priv.h.pp Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clash 2009-10-06 13:04:51 +02:00
mysqld.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
mysqld_suffix.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
net_serv.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
nt_servc.cc
nt_servc.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
opt_range.cc Manual merge from mysql-trunk. 2010-02-23 17:06:06 +03:00
opt_range.h Ported WL#3220 to mysql-next-mr. 2009-09-28 10:21:25 +03:00
opt_sum.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +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
partition_element.h Merge 2009-10-28 18:32:48 +01:00
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 Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
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 Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
records.cc Manual merge from mysql-trunk-merge. 2009-11-06 19:13:33 +03:00
records.h Manual merge from mysql-trunk-merge. 2009-11-06 19:13:33 +03:00
repl_failsafe.cc BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basic 2010-02-03 16:56:17 +00:00
repl_failsafe.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
replication.h WL#4903 Plugin Service API part I 2009-11-02 21:05:42 +01:00
rpl_constants.h
rpl_filter.cc Backport of: 2009-10-14 20:37:38 +04:00
rpl_filter.h
rpl_handler.cc Auto Merge fix for bug#50157 2010-01-31 03:14:29 +08:00
rpl_handler.h Backporting WL#4398 WL#1720 2009-09-26 12:49:49 +08:00
rpl_injector.cc Fix for compiler warnings: 2010-01-28 19:51:40 -02:00
rpl_injector.h Backport of: 2009-10-14 15:14:58 +04:00
rpl_mi.cc BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basic 2010-02-03 16:56:17 +00:00
rpl_mi.h BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basic 2010-02-03 16:56:17 +00:00
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
rpl_reporting.h
rpl_rli.cc BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basic 2010-02-03 16:56:17 +00:00
rpl_rli.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-16 16:47:07 +03:00
rpl_tblmap.cc Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
rpl_tblmap.h Backport of: 2009-10-14 20:37:38 +04:00
rpl_utility.cc
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
scheduler.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
set_var.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-01-24 00:09:23 +03:00
set_var.h Bug#38551 query cache can still consume [very little] cpu time even when it is off. 2009-10-29 12:19:36 +01:00
slave.cc Post-push fix for BUG#50364. 2010-02-22 00:26:29 +00:00
slave.h Bug #47210 first execution of "start slave until" stops too early 2009-11-12 17:10:19 +02:00
sp.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
sp.h Bug#45613 handle failures from my_hash_insert 2009-11-20 16:18:01 +01:00
sp_cache.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
sp_cache.h
sp_head.cc revert 48525 2010-02-22 16:58:56 +00:00
sp_head.h Bug#45613 handle failures from my_hash_insert 2009-11-20 16:18:01 +01:00
sp_pcontext.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sp_pcontext.h Manual merge. 2009-12-18 16:44:24 -02:00
sp_rcontext.cc Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
sp_rcontext.h WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
spatial.cc Merge from 5.0 for 43414 2009-08-28 18:21:54 +02:00
spatial.h Merge from 5.0-bugteam 2009-06-17 16:56:44 +02:00
sql_acl.cc Manual merge from mysql-5.1-bugteam. 2010-02-03 17:01:48 +03:00
sql_acl.h Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
sql_analyse.cc Merge from 5.0-bugteam 2009-06-17 16:56:44 +02:00
sql_analyse.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_array.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_base.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
sql_binlog.cc manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
sql_cache.h Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
sql_class.cc revert 48525 2010-02-22 16:58:56 +00:00
sql_class.h revert 48525 2010-02-22 16:58:56 +00:00
sql_client.cc
sql_connect.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-23 16:42:05 +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 Auto-merge from mysql-trunk-merge. 2009-11-06 18:28:25 +03:00
sql_cursor.h
sql_db.cc Manual merge from mysql-5.1-bugteam. 2010-01-30 22:13:36 +03:00
sql_delete.cc Manual merge from mysql-5.1-bugteam. 2010-01-30 21:47:11 +03:00
sql_derived.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sql_do.cc
sql_error.cc Merge from mysql-next-mr. 2009-10-23 15:22:21 +04:00
sql_error.h WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
sql_handler.cc Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
sql_help.cc Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
sql_insert.cc revert 48525 2010-02-22 16:58:56 +00:00
sql_lex.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
sql_lex.h Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-02-09 12:59:38 +05:00
sql_list.cc Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
sql_list.h Fix build failure on Linux. 2009-10-22 23:31:06 +04:00
sql_load.cc Manual merge from mysql-5.1-bugteam. 2010-01-30 21:47:11 +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
sql_map.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_olap.cc
sql_parse.cc BUG#48632: Fix for Bug #23300 Has Not Been Backported 2010-02-05 17:01:09 +00:00
sql_partition.cc Manual merge from mysql-5.1-bugteam. 2010-01-30 21:47:11 +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 Auto-merge from mysql-trunk. 2010-02-05 15:02:03 +03:00
sql_plugin.h WL#4903 Plugin Service API part I 2009-11-02 21:05:42 +01:00
sql_plugin_services.h WL#4903 Plugin Service API part I 2009-11-02 21:05:42 +01:00
sql_prepare.cc Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-01-24 00:09:23 +03:00
sql_prepare.h Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
sql_profile.cc Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, 2009-10-22 00:02:06 +04:00
sql_profile.h Bug #44651 "have_community_features" variable should be renamed 2009-10-09 15:59:25 +02:00
sql_rename.cc Backport Bug#37148 to 5.1 2010-01-24 15:03:23 +08:00
sql_repl.cc BUG#50780: 'show binary logs' debug assertion when binary 2010-02-05 17:51:55 +00:00
sql_repl.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_select.cc Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-26 16:06:31 +03:00
sql_select.h Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
sql_servers.cc Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. 2010-01-15 14:26:53 +03:00
sql_servers.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_show.cc Manual merge from mysql-5.1-bugteam. 2010-02-03 20:22:58 +03:00
sql_show.h
sql_signal.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sql_signal.h WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sql_sort.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_state.c
sql_string.cc Backporting WL#3759 Optimize identifier conversion in client-server protocol 2009-09-30 10:09:28 +05:00
sql_string.h Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
sql_table.cc Manual merge from mysql-trunk. 2010-02-23 17:06:06 +03:00
sql_tablespace.cc Manual merge from mysql-5.1-bugteam. 2010-01-30 21:47:11 +03:00
sql_test.cc Manual merge from mysql-5.1-bugteam. 2010-01-30 22:13:36 +03:00
sql_trigger.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
sql_trigger.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_udf.cc Manual merge from mysql-5.1-bugteam. 2010-01-30 21:47:11 +03:00
sql_udf.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_union.cc Bug #49734: Crash on EXPLAIN EXTENDED UNION ... ORDER BY <any non-const-function> 2009-12-22 17:52:15 +02:00
sql_update.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-23 16:26:45 +03:00
sql_view.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
sql_view.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_yacc.yy Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-23 16:26:45 +03:00
strfunc.cc Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-09-23 15:21:29 +02:00
structs.h A fix and a test case for 2009-11-03 20:45:52 +03:00
table.cc Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
table.h Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
thr_malloc.cc WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
time.cc Manual merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03:00
tzfile.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
tztime.cc Backport of: 2009-10-14 20:37:38 +04:00
tztime.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
udf_example.c Manual merge from mysql-trunk-merge. 2009-10-14 12:25:39 +04:00
udf_example.def
uniques.cc Merge from 5.0-bugteam 2009-06-17 16:56:44 +02:00
unireg.cc Backporting WL#4164 Two-byte collation IDs 2009-10-15 15:17:32 +05:00
unireg.h Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table 2010-02-10 10:47:14 +01:00