mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
Dmitry Lenev e86bbbda55 Fix for bug #56251 "Deadlock with INSERT DELAYED and MERGE 
tables".

Attempting to issue an INSERT DELAYED statement for a MERGE
table might have caused a deadlock if it happened as part of
a transaction or under LOCK TABLES, and there was a concurrent
DDL or LOCK TABLES ... WRITE statement which tried to lock one
of its underlying tables.

The problem occurred when a delayed insert handler thread tried
to open a MERGE table and discovered that to do this it had also
to open all underlying tables and hence acquire metadata
locks on them. Since metadata locks on the underlying tables were
not pre-acquired by the connection thread executing INSERT DELAYED,
attempts to do so might lead to waiting. In this case the
connection thread had to wait for the delayed insert thread.
If the thread which was preventing the lock on the underlying table
from being acquired had to wait for the connection thread (due to
this or other metadata locks), a deadlock occurred. 
This deadlock was not detected by the MDL deadlock detector since 
waiting for the handler thread by the connection thread is not
represented in the wait-for graph.

This patch solves the problem by ensuring that the delayed
insert handler thread never tries to open underlying tables 
of a MERGE table. Instead open_tables() is aborted right after
the parent table is opened and a ER_DELAYED_NOT_SUPPORTED 
error is emitted (which is passed to the connection thread and
ultimately to the user).

mysql-test/r/merge.result:
  Added test for bug #56251 "Deadlock with INSERT DELAYED and
  MERGE tables".
mysql-test/t/merge.test:
  Added test for bug #56251 "Deadlock with INSERT DELAYED and
  MERGE tables".
sql/sql_base.cc:
  Changed open_n_lock_single_table() to take prelocking strategy
  as an argument instead of always using DML_prelocking_strategy.
sql/sql_base.h:
  Changed open_n_lock_single_table() to take prelocking strategy
  as an argument instead of always using DML_prelocking_strategy.
  Added a version of this function which is compatible with old
  signature.
sql/sql_insert.cc:
  When opening MERGE table in delayed insert thread stop and emit
  ER_DELAYED_NOT_SUPPORTED right after opening main table and
  before opening underlying tables. This ensures that we won't
  try to acquire metadata lock on underlying tables which might
  lead to a deadlock.
  This is achieved by using special prelocking strategy which
  abort open_tables() process as soon as we discover that we
  have opened table with engine which doesn't support delayed
  inserts.
2010-09-15 18:15:31 +04:00
..
examples Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect). 2010-08-12 19:19:57 +04:00
share Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect). 2010-08-12 19:19:57 +04:00
add_errmsg WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
authors.h Merging with mysql-5.5-stage. 2010-08-16 14:50:27 +02:00
client_settings.h Backport of WL#798 (MySQL IPv6 support) from 6.0. 2009-11-25 13:53:23 +03:00
CMakeLists.txt Small fixes in CMake: 2010-09-03 00:17:08 +02:00
contributors.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
custom_conf.h
datadict.cc Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime. 2010-08-18 13:29:04 +02:00
datadict.h Bug#49907: ALTER TABLE ... TRUNCATE PARTITION does not wait for 2010-08-16 14:53:30 +02:00
debug_sync.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -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 Bug#53251 mysql_library_init fails on second execution with embedded library 2010-09-02 23:37:04 +05:00
derror.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
des_key_file.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
des_key_file.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
discover.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
discover.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
event_data_objects.cc A pre-requisite patch for the fix for Bug#52044. 2010-07-27 14:25:53 +04:00
event_data_objects.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
event_db_repository.cc Bug #54105 assert in MDL_context::release_locks_stored_before 2010-08-13 10:02:37 +02:00
event_db_repository.h A pre-requisite patch for the fix for Bug#52044. 2010-07-27 14:25:53 +04:00
event_parse_data.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
event_parse_data.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
event_queue.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
event_queue.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
event_scheduler.cc Merge of mysql-trunk-bugfixing into mysql-trunk-merge. 2010-07-15 10:47:50 -03:00
event_scheduler.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
events.cc Bug #44171 KILL ALTER EVENT can crash the server 2010-08-26 12:01:43 +02:00
events.h Bug #44171 KILL ALTER EVENT can crash the server 2010-08-26 12:01:43 +02:00
field.cc Bug#52121 partition by key on utf32 enum field cause debug assertion: (length % 4) == 0 2010-08-23 13:56:21 +04:00
field.h WL#5498: Remove dead and unused source code 2010-07-23 17:17:55 -03:00
field_conv.cc WL#5498: Remove dead and unused source code 2010-07-23 17:17:55 -03:00
filesort.cc WL#5498: Remove dead and unused source code 2010-07-23 17:17:55 -03:00
filesort.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
frm_crypt.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
frm_crypt.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
gen_lex_hash.cc Cleanup after bild team push. 2010-07-25 19:30:18 +02:00
gstream.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
gstream.h Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
ha_ndbcluster.cc Commit on behalf of Dmitry Lenev. 2010-08-12 17:50:23 +04:00
ha_ndbcluster.h Merge of bug#51851. 2010-05-24 14:51:59 +02:00
ha_ndbcluster_binlog.cc Commit on behalf of Dmitry Lenev. 2010-08-12 17:50:23 +04:00
ha_ndbcluster_binlog.h A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()". 2010-08-09 22:33:47 +04:00
ha_ndbcluster_cond.cc Bug#49746: Const expression caching led to NDB not using engine condition 2010-08-14 13:11:33 +04:00
ha_ndbcluster_cond.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
ha_ndbcluster_tables.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
ha_partition.cc merge 2010-08-19 10:22:23 +02:00
ha_partition.h WL#5498: Remove dead and unused source code 2010-07-23 17:09:27 -03:00
handler.cc A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()". 2010-08-09 22:33:47 +04:00
handler.h Merge from mysql-5.5-bugfixing to mysql-5.5-runtime 2010-08-18 13:55:37 +02:00
hash_filo.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
hash_filo.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
hostname.cc WL#5498: Remove dead and unused source code 2010-07-23 17:17:55 -03:00
hostname.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
init.cc Backport: remove dead code. 2010-05-28 19:53:26 -03:00
init.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
item.cc Revert patch for Bug#56120 temporarily. 2010-08-25 13:17:45 +04:00
item.h Bug#54916 GROUP_CONCAT + IFNULL truncates output 2010-08-19 15:55:35 +04:00
item_buff.cc merge 2010-07-30 16:56:57 +03:00
item_cmpfunc.cc Bug#54916 GROUP_CONCAT + IFNULL truncates output 2010-08-19 15:55:35 +04:00
item_cmpfunc.h WL#5498: Remove dead and unused source code 2010-07-23 17:16:29 -03:00
item_create.cc Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-02 16:38:04 -03:00
item_create.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
item_func.cc Auto-merge from mysql-5.5-merge. 2010-08-25 14:22:34 +04:00
item_func.h Bug#51571 load xml infile causes server crash 2010-05-05 14:34:20 +04:00
item_geofunc.cc WL#5498: Remove dead and unused source code 2010-07-23 17:13:36 -03:00
item_geofunc.h WL#2649 Number-to-string conversions 2010-02-11 08:17:25 +04:00
item_row.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02: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 Bug#55912 FORMAT with locale set fails for numbers < 1000 2010-08-20 15:14:11 +04:00
item_strfunc.h Bug#55912 FORMAT with locale set fails for numbers < 1000 2010-08-20 15:14:11 +04:00
item_subselect.cc Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-06-10 22:30:49 -03:00
item_subselect.h WL#5498: Remove dead and unused source code 2010-07-23 17:16:29 -03:00
item_sum.cc Automerge. 2010-08-30 11:36:04 +04:00
item_sum.h Automerge. 2010-08-30 11:36:04 +04:00
item_timefunc.cc Bug#56271: Wrong comparison result with STR_TO_DATE function 2010-09-07 10:45:00 +04:00
item_timefunc.h Bug#56271: Wrong comparison result with STR_TO_DATE function 2010-09-07 10:45:00 +04:00
item_xmlfunc.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
item_xmlfunc.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
key.cc Bug#52430 Incorrect key in the error message for duplicate key error involving BINARY type 2010-05-27 20:01:43 +04:00
key.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
keycaches.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
keycaches.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
lex.h Auto-merge from mysql-next-mr. 2010-02-20 12:40:21 +03:00
lex_symbol.h
lock.cc Commit on behalf of Dmitry Lenev. 2010-08-12 17:50:23 +04:00
lock.h Extract reload_acl_and_cache() and flush_tables_with_read_lock() 2010-08-13 13:51:48 +04:00
log.cc Auto-merge from mysql-5.5. 2010-08-30 12:36:02 +04:00
log.h merge 2010-08-20 14:22:46 +03:00
log_event.cc Post-fix push for BUG#53452. 2010-08-23 23:31:12 +01:00
log_event.h Merge of mysql-trunk-bugfixing into mysql-trunk-merge. 2010-07-15 10:47:50 -03:00
log_event_old.cc Merge of mysql-trunk-bugfixing into mysql-trunk-merge. 2010-07-15 10:47:50 -03: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 Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime. 2010-08-18 13:29:04 +02:00
mdl.cc Commit on behalf of Dmitry Lenev. 2010-08-12 17:50:23 +04:00
mdl.h Commit on behalf of Dmitry Lenev. 2010-08-12 17:50:23 +04: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 WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
MSG00001.bin
my_decimal.cc Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-09 09:28:51 -03:00
my_decimal.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
mysqld.cc Bug#53251 mysql_library_init fails on second execution with embedded library 2010-09-02 23:37:04 +05:00
mysqld.h Auto-merge from mysql-5.5-merge. 2010-08-30 18:07:40 +04:00
mysqld_suffix.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
net_serv.cc WL#5486: Remove code for unsupported platforms 2010-07-15 08:13:30 -03:00
nt_servc.cc WL#5498: Remove dead and unused source code 2010-07-23 17:09:27 -03:00
nt_servc.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
opt_range.cc Automerge. 2010-08-26 16:35:38 +04:00
opt_range.h manual merge from mysql-5.1-bugteam 2010-07-19 11:21:24 +02:00
opt_sum.cc Merge of fix for bug#53859. 2010-06-11 10:15:55 +02:00
parse_file.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
parse_file.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
partition_element.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
partition_info.cc Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-20 16:30:10 -03:00
partition_info.h Bug#51851: Server with SBR locks mutex twice on LOAD DATA 2010-03-30 22:52:45 +02:00
password.c WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
procedure.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
procedure.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
protocol.cc Auto-merge from mysql-trunk-merge. 2010-07-29 16:32:11 +04:00
protocol.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
records.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
records.h Bug #30584: delete with order by and limit clauses does not 2010-06-23 00:32:29 +04:00
repl_failsafe.cc WL#5498: Remove dead and unused source code 2010-07-23 17:13:36 -03:00
repl_failsafe.h WL#5498: Remove dead and unused source code 2010-07-23 17:13:36 -03:00
replication.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_constants.h
rpl_filter.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
rpl_filter.h A post-fix patch for WL#4877/WL#5030: 2010-04-12 17:17:37 +04:00
rpl_handler.cc Bug#42733: Type-punning warnings when compiling MySQL -- strict aliasing violations. 2010-07-15 16:29:25 -03:00
rpl_handler.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_injector.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
rpl_injector.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_mi.cc Merge of mysql-trunk-bugfixing into mysql-trunk-merge. 2010-07-15 10:47:50 -03:00
rpl_mi.h BUG#53657: Slave crashed with error 22 when trying to lock mutex 2010-05-24 17:43:27 +01:00
rpl_record.cc Add a maintainer target to the warning-mode of the build scripts. 2010-07-24 10:31:48 -03:00
rpl_record.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_record_old.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_record_old.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_reporting.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_reporting.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_rli.cc A pre-requisite patch for the fix for Bug#52044. 2010-07-27 14:25:53 +04:00
rpl_rli.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_tblmap.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_tblmap.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
rpl_utility.cc Merge of mysql-trunk-bugfixing into mysql-trunk-merge. 2010-07-15 10:47:50 -03:00
rpl_utility.h Bug#53445: Build with -Wall and fix warnings that it generates 2010-05-31 12:29:54 -03:00
scheduler.cc WL#5363: Thread Pool Service Interface 2010-06-15 09:44:26 +02:00
scheduler.h WL#5363: Thread Pool Service Interface 2010-06-07 16:01:39 +02:00
set_var.cc Bug#53251 mysql_library_init fails on second execution with embedded library 2010-09-02 23:37:04 +05:00
set_var.h Bug#53251: mysql_library_init fails on second execution with embedded library 2010-09-09 09:37:09 -03:00
sha2.cc Backport of: 2010-04-13 19:04:45 +04:00
slave.cc Auto-merge from mysql-trunk-merge. 2010-07-29 16:32:11 +04:00
slave.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sp.cc Bug #56137 "Assertion `thd->lock == 0' failed on upgrading 2010-08-31 13:04:19 +04:00
sp.h Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-06-10 22:30:49 -03:00
sp_cache.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sp_cache.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sp_head.cc Fix use of uninitialized variable. 2010-08-12 16:51:46 +04:00
sp_head.h A pre-requisite patch for the fix for Bug#52044. 2010-07-27 14:25:53 +04:00
sp_pcontext.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
sp_pcontext.h Auto-merge from mysql-trunk-bugfixing. 2010-07-30 19:28:36 +04:00
sp_rcontext.cc Auto-merge from mysql-trunk-bugfixing. 2010-07-30 19:28:36 +04:00
sp_rcontext.h Auto-merge from mysql-trunk-bugfixing. 2010-07-30 19:28:36 +04:00
spatial.cc Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-20 16:30:10 -03:00
spatial.h Bug#42733: Type-punning warnings when compiling MySQL -- 2010-07-14 16:39:40 -03:00
sql_acl.cc Polish check_grant(): name TABLE_LIST instance "tl", not "table". 2010-08-31 13:55:32 +04:00
sql_acl.h WL#5030: Splitting mysql_priv.h 2010-04-07 13:58:40 +02:00
sql_admin.cc Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime. 2010-08-18 13:29:04 +02:00
sql_admin.h Rename of sql_alter_table -> sql_alter and sql_table_maintenance -> sql_admin 2010-08-16 16:25:23 +02:00
sql_alter.cc Remove check_merge_table_access(). 2010-08-31 13:59:51 +04:00
sql_alter.h Rename of sql_alter_table -> sql_alter and sql_table_maintenance -> sql_admin 2010-08-16 16:25:23 +02:00
sql_analyse.cc Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-09 09:28:51 -03:00
sql_analyse.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_array.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_audit.cc BUG#54989 - With null_audit installed, server hangs on an 2010-08-20 13:58:28 +04:00
sql_audit.h BUG#54989 - With null_audit installed, server hangs on an 2010-08-20 13:58:28 +04:00
sql_base.cc Fix for bug #56251 "Deadlock with INSERT DELAYED and MERGE 2010-09-15 18:15:31 +04:00
sql_base.h Fix for bug #56251 "Deadlock with INSERT DELAYED and MERGE 2010-09-15 18:15:31 +04:00
sql_binlog.cc Merge of mysql-trunk-bugfixing into mysql-trunk-merge. 2010-07-15 10:47:50 -03:00
sql_binlog.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_bitmap.h WL#5486: Remove code for unsupported platforms 2010-07-15 08:13:30 -03:00
sql_builtin.cc.in merge 2009-12-25 16:49:21 +01:00
sql_cache.cc Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-23 22:36:21 -03:00
sql_cache.h A post-fix patch for WL#4877/WL#5030: 2010-04-12 17:17:37 +04:00
sql_callback.h WL#5363: Thread Pool Service Interface 2010-06-07 16:01:39 +02:00
sql_class.cc Auto-merge from mysql-5.5-merge. 2010-08-30 18:07:40 +04:00
sql_class.h Auto-merge from mysql-5.5-merge. 2010-08-30 18:07:40 +04:00
sql_client.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_connect.cc Merging with mysql-5.5-stage. 2010-08-16 14:50:27 +02:00
sql_connect.h WL#5363: Thread Pool Service Interface 2010-06-07 16:01:39 +02:00
sql_const.h Backport: Remove unused and ancient files, functions, and facilities. 2010-05-28 19:13:31 -03:00
sql_crypt.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_crypt.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_cursor.cc Auto-merge from mysql-trunk-merge. 2010-07-29 16:32:11 +04:00
sql_cursor.h Implement WL#5502 Remove dead 5.0 class Sensitive_cursor. 2010-07-27 16:42:36 +04:00
sql_db.cc merge from mysql-trunk-bugfixing 2010-07-13 10:39:24 +02:00
sql_db.h A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATE 2010-07-01 15:53:46 +02:00
sql_delete.cc Rename select_send::abort() to select_send::abort_result_set() 2010-07-28 15:17:19 +04:00
sql_delete.h Merge trunk-bugfixing -> trunk-runtime 2010-06-17 17:31:51 +04:00
sql_derived.cc Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-06-10 22:30:49 -03:00
sql_derived.h A post-fix patch for WL#4877/WL#5030: 2010-04-12 17:17:37 +04:00
sql_do.cc A pre-requisite patch for the fix for Bug#52044. 2010-07-27 14:25:53 +04:00
sql_do.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_error.cc Auto-merge from mysql-trunk-bugfixing. 2010-07-30 19:28:36 +04:00
sql_error.h Auto-merge from mysql-trunk-bugfixing. 2010-07-30 19:28:36 +04:00
sql_handler.cc Commit on behalf of Dmitry Lenev. 2010-08-12 17:50:23 +04:00
sql_handler.h A review comment for WL#4441 " LOCK_open: Remove requirement of 2010-06-09 12:39:09 +04:00
sql_help.cc A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATE 2010-07-01 15:53:46 +02:00
sql_help.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_hset.h Another follow-up for 5.5 version of fix for bug#54360 2010-07-01 19:48:56 +04:00
sql_insert.cc Fix for bug #56251 "Deadlock with INSERT DELAYED and MERGE 2010-09-15 18:15:31 +04:00
sql_insert.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_lex.cc BUG#53452 Inconsistent behavior of binlog_direct_non_transactional_updates with 2010-08-20 03:59:58 +01:00
sql_lex.h Bug #54579 Wrong unsafe warning for INSERT DELAYED in SBR 2010-08-30 14:03:28 +08:00
sql_list.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_list.h Merge of mysql-trunk-bugfixing into mysql-trunk-merge. 2010-07-15 10:47:50 -03:00
sql_load.cc Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains load data infile 2010-08-03 11:49:14 +08:00
sql_load.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_locale.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
sql_locale.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_manager.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
sql_manager.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_parse.cc Remove check_merge_table_access(). 2010-08-31 13:59:51 +04:00
sql_parse.h Remove check_merge_table_access(). 2010-08-31 13:59:51 +04:00
sql_partition.cc Bug#54747: Deadlock between REORGANIZE PARTITION and SELECT is not detected 2010-08-20 19:15:48 +02:00
sql_partition.h Manual merge 2010-07-29 11:24:35 +08:00
sql_partition_admin.cc Rename of sql_alter_table -> sql_alter and sql_table_maintenance -> sql_admin 2010-08-16 16:25:23 +02:00
sql_partition_admin.h Bug#49907: ALTER TABLE ... TRUNCATE PARTITION does not wait for 2010-08-16 14:53:30 +02:00
sql_plist.h Follow-up for bug#52289 "performance regression 2010-06-07 17:40:52 +04:00
sql_plugin.cc Merge fix for BUG#54989 to mysql-5.5-bugfixing. 2010-08-23 13:38:10 +04:00
sql_plugin.h Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
sql_plugin_services.h WL#5363: Thread Pool Service Interface 2010-06-07 16:01:39 +02:00
sql_prepare.cc WL#5370 Keep forward-compatibility when changing 2010-08-18 17:35:41 +08: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_priv.h Merge trunk-bugfixing -> trunk-runtime. 2010-07-27 18:32:42 +04:00
sql_profile.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
sql_profile.h Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
sql_reload.cc Fix for bug #55273 "FLUSH TABLE tm WITH READ LOCK for Merge 2010-09-09 18:29:14 +04:00
sql_reload.h Extract reload_acl_and_cache() and flush_tables_with_read_lock() 2010-08-13 13:51:48 +04:00
sql_rename.cc Followup for Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE 2010-08-10 13:16:44 +02:00
sql_rename.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_repl.cc merged BUG#55322 from 5.1-bugteam to trunk-merge 2010-07-26 12:52:59 +02:00
sql_repl.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_select.cc Merge 5.1-bugteam to 5.5-merge. 2010-08-27 15:33:32 +04:00
sql_select.h merge 2010-08-17 15:12:52 +03:00
sql_servers.cc Remove dead code. 2010-08-12 20:44:41 +04:00
sql_servers.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_show.cc Auto-merge from mysql-5.5-merge. 2010-08-30 18:07:40 +04:00
sql_show.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_signal.cc Auto-merge from mysql-trunk-bugfixing. 2010-07-30 19:28:36 +04:00
sql_signal.h WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
sql_sort.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_state.c
sql_string.cc Bug#45288: pb2 returns a lot of compilation warnings on linux 2010-07-09 09:00:17 -03:00
sql_string.h Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
sql_table.cc Bug#27480 (Extend CREATE TEMPORARY TABLES privilege 2010-08-31 14:03:36 +04:00
sql_table.h Bug#54747: Deadlock between REORGANIZE PARTITION and SELECT is not detected 2010-08-20 19:15:48 +02:00
sql_tablespace.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_tablespace.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_test.cc Cleanup: remove unused declarations from sql_base.h. 2010-08-04 20:29:13 +04:00
sql_test.h Bug#53445: Build with -Wall and fix warnings that it generates 2010-05-31 12:29:54 -03:00
sql_time.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_time.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_trigger.cc Bug#27480 (Extend CREATE TEMPORARY TABLES privilege 2010-08-31 13:52:56 +04:00
sql_trigger.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_truncate.cc Bug#27480 (Extend CREATE TEMPORARY TABLES privilege 2010-08-31 14:03:36 +04:00
sql_truncate.h Bug#49907: ALTER TABLE ... TRUNCATE PARTITION does not wait for 2010-08-16 14:53:30 +02:00
sql_udf.cc A pre-requisite patch for the fix for Bug#52044. 2010-07-27 14:25:53 +04:00
sql_udf.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_union.cc Implement WL#5502 Remove dead 5.0 class Sensitive_cursor. 2010-07-27 16:42:36 +04:00
sql_union.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sql_update.cc manual merge from mysql-5.1-bugteam 2010-08-09 14:11:29 +02:00
sql_update.h A post-fix patch for WL#4877/WL#5030: 2010-04-12 17:17:37 +04:00
sql_view.cc Merge from mysql-5.5-bugfixing to mysql-5.5-runtime 2010-08-18 13:55:37 +02:00
sql_view.h Bug#42643: InnoDB does not support replication of TRUNCATE TABLE 2010-05-25 17:01:38 -03:00
sql_yacc.yy Fix for bug #55273 "FLUSH TABLE tm WITH READ LOCK for Merge 2010-09-09 18:29:14 +04:00
strfunc.cc WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
strfunc.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
structs.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
sys_vars.cc Auto-merge from mysql-5.5-merge. 2010-08-30 18:07:40 +04:00
sys_vars.h Bug#53251 mysql_library_init fails on second execution with embedded library 2010-09-02 23:37:04 +05:00
sys_vars_shared.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
table.cc Fix TABLE::init() comment. 2010-08-31 13:49:48 +04:00
table.h Merge from mysql-5.5-bugfixing to mysql-5.5-runtime. 2010-09-03 09:42:51 +02:00
thr_malloc.cc Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. 2010-06-11 17:48:24 +04:00
thr_malloc.h Backport: Remove unused and ancient files, functions, and facilities. 2010-05-28 19:13:31 -03:00
transaction.cc Bug #56448 Assertion failed: ! is_set() with second xa end 2010-09-13 13:31:22 +02:00
transaction.h Backport of: 2009-12-03 21:37:38 +03:00
tzfile.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
tztime.cc A pre-requisite patch for the fix for Bug#52044. 2010-07-27 14:25:53 +04:00
tztime.h WL#5030: Split and remove mysql_priv.h 2010-03-31 16:05:33 +02:00
udf_example.c Auto-merge from mysql-trunk-merge. 2010-07-29 16:32:11 +04:00
udf_example.def
uniques.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
unireg.cc Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled 2010-07-08 18:20:08 -03:00
unireg.h Merge of mysql-5.1-bugteam into mysql-trunk-merge. 2010-07-02 16:38:04 -03:00