mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
Jon Olav Hauglid 2c4b6dc503 Bug #51336 Assert in reload_acl_and_cache during RESET QUERY CACHE 
Attempts to execute RESET statements within a transaction that
had acquired metadata locks, led to an assertion failure on 
debug servers. This bug didn't cause any problems on release
builds.

The triggered assert is designed to check that caches are not
flushed or reset while having active transactions. It is triggered
if acquired metadata locks exist that are not from LOCK TABLE or
HANDLER statements.

In this case it was triggered by RESET QUERY CACHE while having
an active transaction that had acquired locks. The reason the
assertion was triggered, was that RESET statements, unlike the
similar FLUSH statements, was not causing an implicit commit.

This patch fixes the problem by making sure RESET statements
commit the current transaction before executing. The commit
causes acquired metadata locks to be released, preventing the
assertion from being triggered.

Incompatible change: This patch changes RESET statements so
that they cause an implicit commit.

Test case added to query_cache.test.
2010-02-26 10:58:33 +01:00
..
examples Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-06-17 15:54:01 +02:00
share Some CMake packaging fixes: 2010-02-24 19:19:24 +00:00
add_errmsg WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
authors.h WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
client_settings.h Backport of WL#798 (MySQL IPv6 support) from 6.0. 2009-11-25 13:53:23 +03:00
CMakeLists.txt Some CMake packaging fixes: 2010-02-24 19:19:24 +00:00
contributors.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
custom_conf.h
debug_sync.cc WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
debug_sync.h WL#4259 - Debug Sync Facility 2009-09-29 17:38:40 +02:00
derror.cc WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
des_key_file.cc WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
discover.cc WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
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 Bug#35997 Event scheduler seems to let the server crash, if it is embedded. 2008-05-09 09:43:02 +02:00
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 Bug#29125 Windows Server X64: so many compiler warnings 2009-02-13 11:41:47 -05:00
event_parse_data.h Added "Sun Microsystems, Inc." to copyright headers on files modified 2008-11-10 21:21:49 +01:00
event_queue.cc Merge backport of WL#3771 with mysql-next-mr. 2010-01-19 17:30:55 +04:00
event_queue.h WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
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 WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
events.cc Manual merge from mysql-next-mr. 2010-02-15 14:16:49 +03:00
events.h WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
field.cc Manual merge from mysql-trunk-merge. 2010-01-19 19:36:14 +03:00
field.h Merge next-mr -> next-4284. 2010-02-06 13:28:06 +03:00
field_conv.cc Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-06-17 15:54:01 +02:00
filesort.cc Manual merge from mysql-trunk-merge. 2010-01-31 01:06:50 +03:00
frm_crypt.cc
gen_lex_hash.cc Bug#29125 Windows Server X64: so many compiler warnings 2009-02-13 11:41:47 -05:00
gstream.cc Bug #43414 Parenthesis (and other) warnings compiling MySQL 2009-06-09 18:11:21 +02:00
gstream.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
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 WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
ha_ndbcluster_binlog.cc Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
ha_ndbcluster_binlog.h WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
ha_ndbcluster_cond.cc fixed warnings and compile errors from the fix for bug 26243 2008-03-29 09:52:16 +02:00
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 Merge next-mr -> next-4284. 2010-02-06 13:28:06 +03:00
ha_partition.h Merge next-mr -> next-4284. 2010-02-06 13:28:06 +03:00
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 WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
hostname.cc WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
init.cc Backport of: 2009-11-24 16:54:59 +03:00
item.cc Auto-merge from mysql-trunk-merge. 2010-01-27 22:15:32 +03:00
item.h Manual merge from mysql-trunk-merge. 2010-01-19 19:36:14 +03:00
item_buff.cc
item_cmpfunc.cc Bug#43201 : Stack overrun when running sp-error test. 2010-02-23 12:48:26 +01:00
item_cmpfunc.h merge 5.1-main to 5.1-bugteam 2010-01-13 12:28:42 +02:00
item_create.cc Manual merge from mysql-trunk-merge. 2010-01-19 19:36:14 +03:00
item_create.h
item_func.cc Bug#43201 : Stack overrun when running sp-error test. 2010-02-23 12:48:26 +01: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 Fix for Bug#30217: Views: changes in metadata behaviour 2008-02-22 13:30:33 +03: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-trunk-merge. 2010-01-31 01:06:50 +03:00
item_strfunc.h Manual merge from mysql-trunk-merge. 2010-01-31 01:06:50 +03:00
item_subselect.cc Manual merge from mysql-trunk. 2009-12-11 12:39:38 +03:00
item_subselect.h merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7 2009-12-17 00:09:52 +00:00
item_sum.cc Bug#48920: COUNT DISTINCT returns 1 for NULL values when in a 2010-01-04 10:39:42 +01:00
item_sum.h merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7 2009-12-17 00:09:52 +00:00
item_timefunc.cc Manual merge from mysql-trunk-merge. 2009-12-16 21:02:21 +03:00
item_timefunc.h WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01: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
keycaches.cc WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
keycaches.h WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
lex.h Auto-merge from mysql-next-mr. 2010-02-20 12:40:21 +03:00
lex_symbol.h
lock.cc Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
log.cc merge 2010-02-16 23:19:47 +01:00
log.h Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. 2010-02-02 10:56:42 +03:00
log_event.cc Bug #51336 Assert in reload_acl_and_cache during RESET QUERY CACHE 2010-02-26 10:58:33 +01:00
log_event.h auto merge from mysql-5.1-rep+3. 2010-02-09 12:10:47 +00:00
log_event_old.cc Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
log_event_old.h BUG#31583 (5.1-telco-6.1 -> 5.1.22. Slave returns Error in unknown event): 2007-12-05 20:00:14 +01:00
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 merge 2010-02-16 23:19:47 +01:00
mdl.cc Fix for bug #51093 "Crash (possibly stack overflow) in 2010-02-15 15:37:48 +03:00
mdl.h Fix for bug #51136 "Crash in pthread_rwlock_rdlock on 2010-02-15 14:23:36 +03:00
message.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
message.mc Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows. 2008-10-23 15:28:53 +02:00
message.rc Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows. 2008-10-23 15:28:53 +02:00
mf_iocache.cc
MSG00001.bin Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows. 2008-10-23 15:28:53 +02:00
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 Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01: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 from mysql-next-mr. 2010-02-22 16:22:31 +03:00
mysqld_suffix.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
net_serv.cc WL#4949, Remove use of LOCK_alarm by instead using SO_SNDTIME0/SO_RCVTIME0 2009-11-12 12:17:31 +01:00
nt_servc.cc WL#5161 : Cross-platform build with CMake 2009-11-09 12:32:48 +01:00
nt_servc.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
opt_range.cc Bug#43201 : Stack overrun when running sp-error test. 2010-02-23 12:48:26 +01: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 WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
parse_file.h Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist(addon) 2009-04-13 18:09:10 +05:00
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 Manual merge. 2009-06-01 16:00:38 +04:00
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 WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch" 2010-01-06 11:54:45 +01: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 Patch to eliminate warnings in mysql-next-mr-bugteam. 2010-01-25 22:34:34 +01:00
replication.h WL#2360 Performance schema 2009-12-09 20:19:51 -07:00
rpl_constants.h BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event 2008-12-29 17:04:10 +01:00
rpl_filter.cc Backport of: 2009-10-14 20:37:38 +04:00
rpl_filter.h
rpl_handler.cc Manual Merge for bug#50157 2010-01-31 21:37:41 +08:00
rpl_handler.h Backporting WL#4398 WL#1720 2009-09-26 12:49:49 +08:00
rpl_injector.cc Merge next-mr -> next-4284. 2010-02-06 13:28:06 +03:00
rpl_injector.h Backport of: 2009-10-14 15:14:58 +04:00
rpl_mi.cc BUG#50364: manual merge to mysql-next-mr-bugfixing. 2010-02-03 17:19:58 +00:00
rpl_mi.h BUG#50364: manual merge to mysql-next-mr-bugfixing. 2010-02-03 17:19:58 +00:00
rpl_record.cc Manual merge from mysql-trunk-merge. 2010-01-31 00:26:38 +03: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 WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
rpl_reporting.h WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
rpl_rli.cc Manual merge from mysql-next-mr. 2010-02-15 14:16:49 +03:00
rpl_rli.h Merge next-mr -> next-4284. 2010-02-05 01:08:08 +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 Merging with mysql-5.1-rep+2-delivery1 2010-01-13 13:37:01 +01:00
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 WL#2360 Performance schema 2010-01-11 18:47:27 -07:00
scheduler.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
set_var.cc Merge next-mr -> next-4284 2010-02-03 16:43:03 +03:00
set_var.h merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
slave.cc Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
slave.h WL#2360 Performance schema 2010-01-11 18:47:27 -07:00
sp.cc Manual merge from mysql-next-mr. 2010-02-15 14:16:49 +03:00
sp.h Merge next-mr -> next-4284. 2010-02-04 00:48:40 +03:00
sp_cache.cc Merge next-mr -> next-4284. 2010-02-02 02:22:16 +03:00
sp_cache.h Apply and review: 2009-12-29 15:19:05 +03:00
sp_head.cc Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
sp_head.h Merge next-mr -> next-4284. 2010-02-05 01:08:08 +03:00
sp_pcontext.cc Backport of: 2009-11-24 16:54:59 +03: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 Bug#38959 archive_gis fails due to rounding difference 2010-02-17 14:19:17 +04:00
spatial.h Merge from 5.0-bugteam 2009-06-17 16:56:44 +02:00
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 WL#2360 Performance schema 2010-01-06 22:42:07 -07: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_audit.cc Merge backport of WL#3771 with mysql-next-mr. 2010-01-19 17:30:55 +04:00
sql_audit.h Backport from 6.0-codebase. 2009-12-16 15:56:36 +04:00
sql_base.cc Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01: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 Fix Bug#27812 "an ampersand is missed in sql/sql_bitmap.h, line 68" 2008-01-29 14:14:34 +03:00
sql_builtin.cc.in merge 2009-12-25 16:49:21 +01:00
sql_cache.cc Merge next-mr -> next-4284 2010-02-03 16:43:03 +03:00
sql_cache.h WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
sql_class.cc Manual merge from mysql-next-mr. 2010-02-15 14:16:49 +03:00
sql_class.h Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
sql_client.cc
sql_connect.cc Auto-merge from mysql-next-mr. 2010-01-25 19:48:45 +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 Merge next-mr -> next-4284. 2010-02-03 03:06:42 +03:00
sql_cursor.h
sql_db.cc Merge next-mr -> next-4284. 2010-02-06 13:28:06 +03:00
sql_delete.cc Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
sql_derived.cc WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
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 Bug #51355 handler stmt cause assertion in 2010-02-25 18:08:12 +01:00
sql_help.cc Patch that changes metadata locking subsystem to use mutex per lock and 2010-01-21 23:43:03 +03:00
sql_insert.cc Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
sql_lex.cc Bug #50192 Strange effect in replication test, trigger, auto_increment 2010-01-29 15:55:35 +02:00
sql_lex.h Manual merge from mysql-next-mr. 2010-02-15 14:16:49 +03: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 2010-01-12 12:32:55 +01:00
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 Manual-merge from mysql-trunk-merge. 2009-11-06 12:52:45 +03:00
sql_manager.cc WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
sql_map.cc WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
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 #51336 Assert in reload_acl_and_cache during RESET QUERY CACHE 2010-02-26 10:58:33 +01:00
sql_partition.cc Merge next-mr -> next-4284. 2010-02-06 13:28:06 +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_plist.h Patch that changes metadata locking subsystem to use mutex per lock and 2010-01-21 23:43:03 +03:00
sql_plugin.cc Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
sql_plugin.h WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
sql_plugin_services.h WL#4903 Plugin Service API part I 2009-11-02 21:05:42 +01:00
sql_prepare.cc Merge next-mr -> next-4284. 2010-02-06 13:28: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 Manual merge from mysql-next-mr. 2010-02-15 14:16:49 +03:00
sql_profile.h Manual merge from mysql-next-mr. 2010-02-15 14:16:49 +03:00
sql_rename.cc Merge next-mr -> next-4284. 2010-02-04 23:15:47 +03:00
sql_repl.cc Manual merge from mysql-next-mr. 2010-02-05 15:05:37 +03:00
sql_repl.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_select.cc Bug#43201 : Stack overrun when running sp-error test. 2010-02-23 12:48:26 +01:00
sql_select.h Auto-merge from mysql-trunk-merge. 2010-01-27 22:15:32 +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 WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_show.cc Patch for WL#3736: Extended Table, Column and Index Comments. 2010-02-20 13:07:32 +03:00
sql_show.h Added "Sun Microsystems, Inc." to copyright headers on files modified 2008-11-10 21:21:49 +01:00
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 Backport of WL #2934: Make/find library for doing float/double 2009-12-22 19:23:13 +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 Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
sql_tablespace.cc Merge next-mr -> next-4284. 2010-02-04 23:15:47 +03:00
sql_test.cc Merge next-mr -> next-4284. 2010-02-06 13:28:06 +03:00
sql_trigger.cc Merge next-mr -> next-4284. 2010-02-04 23:15:47 +03:00
sql_trigger.h Backport of: 2009-12-08 17:13:12 +03:00
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 WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_union.cc Manual merge from mysql-trunk-merge. 2010-01-19 19:36:14 +03:00
sql_update.cc Fix for bug #50913 "Deadlock between open_and_lock_tables_derived 2010-02-08 23:19:55 +03:00
sql_view.cc Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
sql_view.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
sql_yacc.yy Auto-merge from mysql-next-mr. 2010-02-21 22:36:05 +03:00
strfunc.cc WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
structs.h Patch for WL#3736: Extended Table, Column and Index Comments. 2010-02-20 13:07:32 +03:00
sys_vars.cc Auto-merge from mysql-next-mr. 2010-02-20 12:40:21 +03:00
sys_vars.h WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
sys_vars_shared.h WL#2360 Performance schema 2010-01-06 22:42:07 -07:00
table.cc Patch for WL#3736: Extended Table, Column and Index Comments. 2010-02-20 13:07:32 +03:00
table.h Merge next-mr -> next-4284 2010-02-03 16:43:03 +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
transaction.cc Merge next-mr -> next-4284. 2010-02-03 03:06:42 +03: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 Followup to Bug#45225 Locking: hang if drop table with no timeout 2010-02-24 18:04:00 +01:00
tztime.h WL#5016: Fix header file include guards 2009-09-23 23:32:31 +02:00
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 Patch for WL#3736: Extended Table, Column and Index Comments. 2010-02-20 13:07:32 +03:00
unireg.h merge 2010-02-10 11:08:39 +01:00