Alexey Kopytov f10885675c Manual merge of mysql-trunk into mysql-trunk-merge. ... Conflicts: Text conflict in client/mysqlbinlog.cc Text conflict in mysql-test/Makefile.am Text conflict in mysql-test/collections/default.daily Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test Text conflict in mysys/charset.c Text conflict in sql/field.cc Text conflict in sql/field.h Text conflict in sql/item.h Text conflict in sql/item_func.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysqld.cc Text conflict in sql/rpl_utility.cc Text conflict in sql/rpl_utility.h Text conflict in sql/set_var.cc Text conflict in sql/share/Makefile.am Text conflict in sql/sql_delete.cc Text conflict in sql/sql_plugin.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in storage/example/ha_example.h Text conflict in storage/federated/ha_federated.cc Text conflict in storage/myisammrg/ha_myisammrg.cc Text conflict in storage/myisammrg/myrg_open.c		2010-03-24 18:03:44 +03:00
..
examples
share	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
add_errmsg
authors.h
client_settings.h
CMakeLists.txt	merge	2010-03-03 15:48:54 +01:00
contributors.h
custom_conf.h
debug_sync.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
debug_sync.h	Bug #51648 DBUG_SYNC_POINT is not defined on all platforms and mtr cant pre-check that	2010-03-19 11:06:40 +02:00
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc
event_data_objects.h
event_db_repository.cc	Followup to Bug#45225 Locking: hang if drop table with no timeout	2010-02-24 18:04:00 +01:00
event_db_repository.h
event_parse_data.cc
event_parse_data.h
event_queue.cc
event_queue.h
event_scheduler.cc	Followup to Bug#45225 Locking: hang if drop table with no timeout	2010-02-24 18:04:00 +01:00
event_scheduler.h
events.cc	Bug #51160 Deadlock around SET GLOBAL EVENT_SCHEDULER = ON|OFF	2010-03-15 14:52:25 +01:00
events.h	Bug #51160 Deadlock around SET GLOBAL EVENT_SCHEDULER = ON|OFF	2010-03-15 14:52:25 +01:00
field.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
field.h	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
field_conv.cc	revert 48525	2010-02-22 16:58:56 +00:00
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc	Followup to Bug#45225 Locking: hang if drop table with no timeout	2010-02-24 18:04:00 +01:00
ha_ndbcluster.h
ha_ndbcluster_binlog.cc	A review comment for the fix for Bug#46672.	2010-03-13 13:58:27 +03:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
ha_partition.h
handler.cc	merge	2010-02-16 23:19:47 +01:00
handler.h	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
item.h	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
item_buff.cc
item_cmpfunc.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
item_cmpfunc.h	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
item_create.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
item_create.h	Bug #49829 Many "hides virtual function" warnings with	2010-03-14 17:01:45 +01:00
item_func.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
item_func.h	Manual merge.	2010-03-19 11:29:12 +03:00
item_geofunc.cc	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
item_geofunc.h	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
item_row.cc	Bug#51598 Inconsistent behaviour with a COALESCE statement inside an IN comparison	2010-03-19 10:21:37 +04:00
item_row.h	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-03-20 23:23:42 +03:00
item_strfunc.cc	Mergine from mysql-next-me	2010-02-27 11:43:32 +04:00
item_strfunc.h	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
item_subselect.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
item_subselect.h
item_sum.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
item_sum.h	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
item_timefunc.cc	Auto-merge from mysql-5.1.	2010-03-01 12:02:15 +03:00
item_timefunc.h	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
item_xmlfunc.cc	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
item_xmlfunc.h
key.cc
keycaches.cc
keycaches.h
lex.h	Auto-merge from mysql-next-mr.	2010-02-20 12:40:21 +03:00
lex_symbol.h
lock.cc	A post-review fix for type-aware metadata locks.	2010-03-16 00:20:20 +03:00
log.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
log.h
log_event.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
log_event.h	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-03-20 23:23:42 +03:00
log_event_old.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
log_event_old.h
main.cc
Makefile.am	merge	2010-02-16 23:19:47 +01:00
mdl.cc	Bug#51295 Build warnings in mdl.cc	2010-03-07 10:50:47 -07:00
mdl.h	Bug#51295 Build warnings in mdl.cc	2010-03-07 10:50:47 -07:00
message.h
message.mc
message.rc
mf_iocache.cc
MSG00001.bin
my_decimal.cc	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
my_decimal.h
my_lock.c
mysql_priv.h	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
mysql_priv.h.pp	A follow-up on WL#5154 and WL#5182: remove forgotten options.	2010-03-03 22:22:02 +03:00
mysqld.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
mysqld_suffix.h
net_serv.cc	A follow-up on WL#5154 and WL#5182: remove forgotten options.	2010-03-03 22:22:02 +03:00
nt_servc.cc
nt_servc.h
opt_range.cc	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
opt_range.h
opt_sum.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
protocol.h
records.cc
records.h
repl_failsafe.cc
repl_failsafe.h
replication.h
rpl_constants.h
rpl_filter.cc
rpl_filter.h
rpl_handler.cc
rpl_handler.h
rpl_injector.cc
rpl_injector.h
rpl_mi.cc
rpl_mi.h
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 from mysql-next-mr.	2010-02-15 14:16:49 +03:00
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc	BUG#49618: Field length stored incorrectly in binary log	2010-03-17 15:28:49 +01:00
rpl_utility.h	Merging with mysql-5.1-bugteam	2010-03-17 19:15:41 +01:00
scheduler.cc
scheduler.h
set_var.cc	Post-merge fix for main.xa failures.	2010-03-12 13:13:02 +03:00
set_var.h
slave.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
slave.h
sp.cc	Manual merge from mysql-next-mr.	2010-02-15 14:16:49 +03:00
sp.h
sp_cache.cc	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
sp_cache.h
sp_head.cc	Manual merge from mysql-next-mr.	2010-03-02 17:34:50 +03:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc	Bug#38959 archive_gis fails due to rounding difference	2010-02-17 14:19:17 +04:00
spatial.h
sql_acl.cc	Followup to Bug#45225 Locking: hang if drop table with no timeout	2010-02-24 18:04:00 +01:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_audit.cc
sql_audit.h
sql_base.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc
sql_cache.h
sql_class.cc	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
sql_class.h	BUG#51426: overflow for auto_increment column causes slave to stop	2010-03-17 00:06:13 +00:00
sql_client.cc
sql_connect.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc	A review comment for the fix for Bug#46672.	2010-03-13 13:58:27 +03:00
sql_delete.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc	A post-review fix for type-aware metadata locks.	2010-03-16 00:20:20 +03:00
sql_help.cc
sql_insert.cc	A post-review fix for type-aware metadata locks.	2010-03-16 00:20:20 +03:00
sql_lex.cc	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
sql_lex.h	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
sql_list.cc
sql_list.h
sql_load.cc	Followup to Bug#45225 Locking: hang if drop table with no timeout	2010-02-24 18:04:00 +01:00
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc	A fix and a test case for Bug#51710 FLUSH TABLES <view> WITH READ	2010-03-10 17:35:25 +03:00
sql_partition.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
sql_partition.h
sql_plist.h
sql_plugin.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
sql_plugin.h
sql_plugin_services.h
sql_prepare.cc	A fix for Bug#49972 "Crash in prepared statements":	2010-03-11 16:47:34 +03:00
sql_prepare.h
sql_profile.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
sql_profile.h	Manual merge from mysql-next-mr.	2010-02-15 14:16:49 +03:00
sql_rename.cc
sql_repl.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
sql_repl.h
sql_select.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
sql_select.h	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
sql_servers.cc	Followup to Bug#45225 Locking: hang if drop table with no timeout	2010-02-24 18:04:00 +01:00
sql_servers.h
sql_show.cc	A post-review fix for type-aware metadata locks.	2010-03-16 00:20:20 +03:00
sql_show.h
sql_signal.cc
sql_signal.h
sql_sort.h
sql_state.c
sql_string.cc	Backporting WL#1213	2010-02-24 13:15:34 +04:00
sql_string.h
sql_table.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
sql_trigger.h
sql_udf.cc	Followup to Bug#45225 Locking: hang if drop table with no timeout	2010-02-24 18:04:00 +01:00
sql_udf.h
sql_union.cc
sql_update.cc	A review comment for the fix for Bug#46672.	2010-03-13 13:58:27 +03:00
sql_view.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
sql_view.h
sql_yacc.yy	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
strfunc.cc
structs.h	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
sys_vars.cc	Bug #51160 Deadlock around SET GLOBAL EVENT_SCHEDULER = ON|OFF	2010-03-15 14:52:25 +01:00
sys_vars.h
sys_vars_shared.h
table.cc	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
table.h	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
thr_malloc.cc
time.cc	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
transaction.cc
transaction.h
tzfile.h
tztime.cc	A post-review fix for type-aware metadata locks.	2010-03-16 00:20:20 +03:00
tztime.h
udf_example.c	Merge in fix for bug#42589	2010-03-15 14:57:20 +01:00
udf_example.def
uniques.cc
unireg.cc	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
unireg.h