Konstantin Osipov 195adcd201 Backport of: ... ---------------------------------------------------------- revno: 2617.23.19 committer: Konstantin Osipov <kostja@sun.com> branch nick: mysql-6.0-runtime timestamp: Tue 2009-03-03 01:20:44 +0300 message: Metadata locking: realign comments. No semantical changes, only enforce a bit of the coding style. This is a review fix for WL#4284 "Transactional DDL locking".		2009-12-04 02:34:19 +03:00
..
examples
share	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
.cvsignore
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	Backport of WL#798 (MySQL IPv6 support) from 6.0.	2009-11-25 13:53:23 +03:00
CMakeLists.txt	Backport of:	2009-12-03 21:37:38 +03:00
contributors.h
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	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	Backport of:	2009-12-04 02:29:40 +03:00
event_db_repository.h
event_parse_data.cc
event_parse_data.h
event_queue.cc
event_queue.h
event_scheduler.cc	Backport of the following revision from 6.0-codebase:	2009-10-13 22:29:28 +04:00
event_scheduler.h
events.cc	Backport of:	2009-12-03 18:47:20 +03:00
events.h
field.cc	Backport of:	2009-11-24 16:54:59 +03:00
field.h	Backport of:	2009-12-02 18:22:15 +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	------------------------------------------------------------	2009-12-04 01:46:14 +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	Backport of:	2009-12-04 02:29:40 +03:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc	Backport of:	2009-12-03 02:09:22 +03:00
ha_partition.h	Backport of:	2009-11-30 22:38:25 +03:00
handler.cc	Backport of:	2009-12-03 21:37:38 +03:00
handler.h	Backport of:	2009-12-03 21:37:38 +03:00
hash_filo.cc
hash_filo.h	Backport of:	2009-10-14 20:37:38 +04:00
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	Backport of:	2009-11-24 16:54:59 +03:00
item.h	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
item_buff.cc
item_cmpfunc.cc	Backport of:	2009-11-24 16:54:59 +03:00
item_cmpfunc.h	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
item_create.cc	Merge	2009-11-03 12:37:02 +01:00
item_create.h
item_func.cc	Manual merge of mysql-next-mr-runtime upstream.	2009-11-19 21:48:08 -02:00
item_func.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
item_geofunc.cc	automerge	2009-10-24 09:57:31 +03:00
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc	Backport of:	2009-11-24 16:54:59 +03:00
item_strfunc.h	manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2009-10-22 23:30:28 +01:00
item_subselect.cc	Manual merge of mysql-next-mr-runtime upstream.	2009-11-19 21:48:08 -02:00
item_subselect.h
item_sum.cc	Manual merge from mysql-trunk-merge.	2009-11-06 17:20:27 +03:00
item_sum.h	Bug#48060 Memory leak - Item::val_bool() (item.cc:184) from optimizer_subquery grammar	2009-10-28 11:07:30 +01:00
item_timefunc.cc	Manual merge of mysql-next-mr-runtime upstream.	2009-11-19 21:48:08 -02:00
item_timefunc.h	Merge to latest mysql-next-mr	2009-11-02 11:09:15 +01:00
item_xmlfunc.cc
item_xmlfunc.h
key.cc	WL#751 Error message construction, backport	2009-10-15 17:23:43 +05:00
lex.h	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
lex_symbol.h
lock.cc	Backport of:	2009-12-04 02:29:40 +03:00
log.cc	------------------------------------------------------------	2009-12-04 01:46:14 +03:00
log.h	BUG#40611: MySQL cannot make a binary log after sequential number	2009-11-22 03:59:48 +00:00
log_event.cc	Backport of:	2009-12-04 02:29:40 +03:00
log_event.h	merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640	2009-11-06 18:35:04 +02:00
log_event_old.cc	Backport of:	2009-12-03 21:37:38 +03:00
log_event_old.h
Makefile.am	Backport of:	2009-12-03 21:37:38 +03:00
mdl.cc	Backport of:	2009-12-04 02:34:19 +03:00
mdl.h	Backport of:	2009-12-04 02:34:19 +03:00
message.h
message.mc
message.rc
mf_iocache.cc
MSG00001.bin
my_decimal.cc
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	Backport of:	2009-12-03 21:37:38 +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	Backport of:	2009-12-03 21:59:52 +03:00
mysqld_suffix.h
net_serv.cc	Manual merge from mysql-next-mr.	2009-11-02 14:10:04 +03:00
nt_servc.cc
nt_servc.h
opt_range.cc	Auto-merge from mysql-next-mr-alik.	2009-11-10 11:34:26 +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	Merge	2009-10-28 18:32:48 +01:00
partition_info.cc	Fix build failure.	2009-11-10 12:32:29 +03:00
partition_info.h	Merged WL#3352 into mysql-next-mr	2009-10-28 18:22:36 +01:00
password.c
procedure.cc
procedure.h	Merge from mysql-next-mr.	2009-10-28 10:55:44 +03:00
protocol.cc	Backport of:	2009-11-24 16:54:59 +03:00
protocol.h	Merge from mysql-next-mr.	2009-10-28 10:55:44 +03:00
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 resolving for the following files	2009-12-01 21:07:18 +02:00
repl_failsafe.h
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	Fix automerge: s/hash_search/my_hash_search/.	2009-10-28 11:42:18 +03:00
rpl_handler.h
rpl_injector.cc	Backport of:	2009-12-03 21:37:38 +03:00
rpl_injector.h	Backport of:	2009-10-14 15:14:58 +04:00
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	BUG#43789 different master/slave table defs cause crash: text/varchar null	2009-09-29 15:18:44 +01:00
rpl_record.h	BUG#43789 different master/slave table defs cause crash: text/varchar null	2009-09-29 15:18:44 +01:00
rpl_record_old.cc
rpl_record_old.h
rpl_reporting.cc
rpl_reporting.h
rpl_rli.cc	Backport of:	2009-12-03 21:37:38 +03:00
rpl_rli.h	Merge next-mr -> next-4284	2009-12-03 14:37:42 +03:00
rpl_tblmap.cc	Backport of:	2009-10-14 20:37:38 +04:00
rpl_tblmap.h	Backport of:	2009-10-14 20:37:38 +04:00
rpl_utility.cc
rpl_utility.h
scheduler.cc
scheduler.h
set_var.cc	Backport of:	2009-12-03 21:37:38 +03:00
set_var.h	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
slave.cc	Backport of:	2009-12-03 21:37:38 +03:00
slave.h	Backport of:	2009-11-23 19:57:31 +03:00
sp.cc	Backport of:	2009-12-03 14:47:05 +03:00
sp.h
sp_cache.cc	Backport of:	2009-10-14 20:37:38 +04:00
sp_cache.h
sp_head.cc	Backport of:	2009-12-04 02:29:40 +03:00
sp_head.h
sp_pcontext.cc	Backport of:	2009-11-24 16:54:59 +03:00
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc	Backport of:	2009-12-04 02:29:40 +03:00
sql_acl.h	Merge from mysql-next-mr.	2009-10-28 10:55:44 +03:00
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc	Backport of:	2009-12-04 02:29:40 +03:00
sql_binlog.cc	Initial import of WL#3726 "DDL locking for all metadata objects".	2009-11-30 18:55:03 +03:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc	------------------------------------------------------------	2009-12-04 01:46:14 +03:00
sql_cache.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
sql_class.cc	------------------------------------------------------------	2009-12-04 01:46:14 +03:00
sql_class.h	Backport of:	2009-12-04 02:29:40 +03: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
sql_crypt.h
sql_cursor.cc	Backport of:	2009-12-01 17:39:03 +03:00
sql_cursor.h
sql_db.cc	Backport of:	2009-12-02 18:22:15 +03:00
sql_delete.cc	Backport of:	2009-12-04 02:29:40 +03:00
sql_derived.cc
sql_do.cc	Backport of:	2009-12-03 21:37:38 +03:00
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	Backport of:	2009-12-04 02:29:40 +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	Backport of:	2009-12-04 02:29:40 +03:00
sql_lex.cc	Merge	2009-11-03 12:37:02 +01:00
sql_lex.h	Manual resolving for the following files	2009-12-01 21:07:18 +02: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	Backport of Bug#15192 to mysql-next-mr	2009-11-10 18:31:28 -02:00
sql_load.cc	Merge next-mr -> next-4284	2009-12-03 14:37:42 +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	Backport of:	2009-12-04 02:29:40 +03:00
sql_partition.cc	Backport of:	2009-12-03 21:37:38 +03:00
sql_partition.h	Fixed a few bugs in hex string generation, in call to val_str for partition expressions, also made code reusable for DEFAULT handling to fix BUG#48464 by introducing function get_cs_converted_string_value, added partition_utf8 test case for UTF8 outputs	2009-11-02 14:49:26 +01:00
sql_plist.h	Backport of:	2009-12-04 02:29:40 +03:00
sql_plugin.cc	Backport of:	2009-12-04 02:29:40 +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	Backport of:	2009-12-01 01:13:06 +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:	2009-12-03 00:24:10 +03:00
sql_profile.h	Backport of:	2009-12-03 00:24:10 +03:00
sql_rename.cc	Backport of:	2009-12-01 22:13:01 +03:00
sql_repl.cc	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
sql_repl.h
sql_select.cc	Backport of:	2009-12-01 17:39:03 +03:00
sql_select.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
sql_servers.cc	Backport of:	2009-12-04 02:29:40 +03:00
sql_servers.h
sql_show.cc	Backport of:	2009-12-04 02:29:40 +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	Backport of:	2009-12-04 02:29:40 +03:00
sql_tablespace.cc	Manual merge from mysql-trunk-merge.	2009-11-05 23:28:35 +03:00
sql_test.cc	Initial import of WL#3726 "DDL locking for all metadata objects".	2009-11-30 18:55:03 +03:00
sql_trigger.cc	Backport of:	2009-12-04 02:29:40 +03:00
sql_trigger.h
sql_udf.cc	Backport of:	2009-12-04 02:29:40 +03:00
sql_udf.h
sql_union.cc
sql_update.cc	Backport of:	2009-12-01 17:39:03 +03:00
sql_view.cc	Backport of:	2009-12-01 17:39:03 +03:00
sql_view.h
sql_yacc.yy	Manual resolving for the following files	2009-12-01 21:07:18 +02: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	Backport of:	2009-12-04 02:29:40 +03:00
table.h	Backport of:	2009-12-04 02:29:40 +03:00
thr_malloc.cc
time.cc	Manual merge from mysql-trunk-merge.	2009-11-06 17:20:27 +03:00
transaction.cc	------------------------------------------------------------	2009-12-04 01:46:14 +03:00
transaction.h	Backport of:	2009-12-03 21:37:38 +03:00
tzfile.h
tztime.cc	Backport of:	2009-11-24 16:54:59 +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