mariadb/sql
Konstantin Osipov 5969dcda21 Backport of:
----------------------------------------------------------
revno: 2630.4.26
committer: Konstantin Osipov <konstantin@mysql.com>
branch nick: mysql-6.0-prelocked_mode-to-push
timestamp: Fri 2008-06-06 23:19:04 +0400
message:
  WL#3726: work on review comments.
  Remove thd->locked_tables. Always store MYSQL_LOCK instances in
  thd->lock.
  Rename thd->prelocked_mode to thd->locked_tables_mode.
  Use thd->locked_tables_mode to determine if we
  are under LOCK TABLES. Update the code to not assume that
  if thd->lock is set, LOCK TABLES mode is off.
  Review comments.


sql/ha_ndbcluster_binlog.cc:
  Don't unlock the lock under LOCK TABLES (safety).
sql/handler.cc:
  There is no thd->locked_tables any more.
  Update comments.
sql/lock.cc:
  There is no thd->locked_tables any more.
sql/log.cc:
  Rename thd->prelocked_mode to thd->locked_tables_mode.
sql/set_var.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
sql/sp_head.cc:
  Rename thd->prelocked_mode to thd->locked_tables_mode.
sql/sql_base.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
  Remove thd->locked_tables.
sql/sql_cache.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
sql/sql_class.cc:
  Avoid code duplication.
  Do not release the table locks prematurely if we're under LOCK TABLES.
  Use thd->locked_tables_mode instead of thd->locked_tables.
sql/sql_class.h:
  Remove thd->locked_tables.
  Make prelocked mode a kind of LOCK TABLES mode.
  Update comments.
sql/sql_cursor.cc:
  Update comments.
sql/sql_insert.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
  Rename thd->prelocked_mode to thd->locked_tables_mode.
sql/sql_load.cc:
  Rename thd->prelocked_mode to thd->locked_tables_mode.
sql/sql_parse.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
  Remove thd->locked_tables.
sql/sql_partition.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
sql/sql_rename.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
sql/sql_select.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
sql/sql_table.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
sql/sql_trigger.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
sql/sql_update.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
sql/sql_view.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
storage/myisam/ha_myisam.cc:
  Use thd->locked_tables_mode to determine if we are under LOCK TABLES.
2009-12-01 17:39:03 +03:00
..
examples
share Manual merge of mysql-next-mr-runtime upstream. 2009-11-19 21:48:08 -02:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt Initial import of WL#3726 "DDL locking for all metadata objects". 2009-11-30 18:55:03 +03:00
contributors.h
custom_conf.h
debug_sync.cc
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 Backport of: 2009-12-01 16:27:03 +03:00
event_db_repository.h
event_parse_data.cc
event_parse_data.h
event_queue.cc
event_queue.h
event_scheduler.cc
event_scheduler.h
events.cc Manual merge from mysql-trunk-merge. 2009-11-05 23:28:35 +03:00
events.h
field.cc Backport of: 2009-11-24 16:54:59 +03:00
field.h Manual merge of mysql-next-mr-runtime upstream. 2009-11-19 21:48:08 -02: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 Initial import of WL#3726 "DDL locking for all metadata objects". 2009-11-30 18:55:03 +03:00
ha_ndbcluster.h
ha_ndbcluster_binlog.cc Backport of: 2009-12-01 17:39:03 +03:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc Backport of: 2009-11-30 22:38:25 +03:00
ha_partition.h Backport of: 2009-11-30 22:38:25 +03:00
handler.cc Backport of: 2009-12-01 17:39:03 +03:00
handler.h Backport of: 2009-11-23 16:09:39 +03:00
hash_filo.cc
hash_filo.h
hostname.cc Backport of: 2009-11-24 16:54:59 +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 merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03:00
item_buff.cc
item_cmpfunc.cc Backport of: 2009-11-24 16:54:59 +03:00
item_cmpfunc.h Manual merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03: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 Manual merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03:00
item_geofunc.cc
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
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
item_timefunc.cc Manual merge of mysql-next-mr-runtime upstream. 2009-11-19 21:48:08 -02:00
item_timefunc.h
item_xmlfunc.cc
item_xmlfunc.h
key.cc
lex.h
lex_symbol.h
lock.cc Backport of: 2009-12-01 17:39:03 +03:00
log.cc Backport of: 2009-12-01 17:39:03 +03:00
log.h
log_event.cc Backport of: 2009-12-01 01:33:22 +03:00
log_event.h
log_event_old.cc Backport of: 2009-11-30 22:03:37 +03:00
log_event_old.h
Makefile.am Initial import of WL#3726 "DDL locking for all metadata objects". 2009-11-30 18:55:03 +03:00
mdl.cc Backport of: 2009-12-01 16:59:11 +03:00
mdl.h Backport of: 2009-12-01 16:59:11 +03:00
message.h
message.mc
message.rc
mf_iocache.cc
MSG00001.bin
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Backport of: 2009-12-01 16:38:00 +03:00
mysql_priv.h.pp
mysqld.cc Initial import of WL#3726 "DDL locking for all metadata objects". 2009-11-30 18:55:03 +03:00
mysqld_suffix.h
net_serv.cc
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
partition_info.cc Fix build failure. 2009-11-10 12:32:29 +03:00
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc Backport of: 2009-11-24 16:54:59 +03: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
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
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 Initial import of WL#3726 "DDL locking for all metadata objects". 2009-11-30 18:55:03 +03:00
rpl_rli.h Initial import of WL#3726 "DDL locking for all metadata objects". 2009-11-30 18:55:03 +03:00
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
scheduler.cc
scheduler.h
set_var.cc Backport of: 2009-12-01 17:39:03 +03:00
set_var.h
slave.cc Backport of: 2009-11-23 19:57:31 +03:00
slave.h Backport of: 2009-11-23 19:57:31 +03:00
sp.cc Manual merge of mysql-next-mr-runtime upstream. 2009-11-19 21:48:08 -02:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Backport of: 2009-12-01 17:39:03 +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 Initial import of WL#3726 "DDL locking for all metadata objects". 2009-11-30 18:55:03 +03:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Backport of: 2009-12-01 17:39:03 +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 Backport of: 2009-12-01 17:39:03 +03:00
sql_cache.h
sql_class.cc Backport of: 2009-12-01 17:39:03 +03:00
sql_class.h Backport of: 2009-12-01 17:39:03 +03:00
sql_client.cc
sql_connect.cc Backport of: 2009-11-24 16:54:59 +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-01 16:42:28 +03:00
sql_delete.cc Backport of: 2009-12-01 16:51:50 +03:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc Backport of: 2009-12-01 16:51:50 +03:00
sql_help.cc
sql_insert.cc Backport of: 2009-12-01 17:39:03 +03:00
sql_lex.cc Merge 2009-11-03 12:37:02 +01:00
sql_lex.h Merge 2009-11-03 12:37:02 +01: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 Backport of: 2009-12-01 17:39:03 +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-01 17:39:03 +03:00
sql_partition.cc Backport of: 2009-12-01 17:39:03 +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-11-30 22:11:32 +03:00
sql_plugin.cc Initial import of WL#3726 "DDL locking for all metadata objects". 2009-11-30 18:55: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 Backport of: 2009-12-01 01:13:06 +03:00
sql_prepare.h
sql_profile.cc
sql_profile.h
sql_rename.cc Backport of: 2009-12-01 17:39:03 +03:00
sql_repl.cc
sql_repl.h
sql_select.cc Backport of: 2009-12-01 17:39:03 +03:00
sql_select.h Manual merge from mysql-trunk-merge. 2009-11-06 19:13:33 +03:00
sql_servers.cc Initial import of WL#3726 "DDL locking for all metadata objects". 2009-11-30 18:55:03 +03:00
sql_servers.h
sql_show.cc Backport of: 2009-12-01 16:59:11 +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-01 17:39:03 +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-01 17:39:03 +03:00
sql_trigger.h
sql_udf.cc Initial import of WL#3726 "DDL locking for all metadata objects". 2009-11-30 18:55:03 +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 merge of mysql-next-mr-runtime upstream. 2009-11-19 21:48:08 -02:00
strfunc.cc
structs.h A fix and a test case for 2009-11-03 20:45:52 +03:00
table.cc Backport of: 2009-12-01 01:33:22 +03:00
table.h Backport of: 2009-12-01 16:51:50 +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 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