mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
Michael Widenius 6d8e329c9a Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK 
- 5.5 was missing calls to ha_extra(HA_PREPARE_FOR_DROP | HA_PREPARE_FOR_RENAME);  Lost in merge 5.3 -> 5.5


sql/sql_admin.cc:
  Updated arguments for close_all_tables_for_name
sql/sql_base.h:
  Updated arguments for close_all_tables_for_name
sql/sql_partition.cc:
  Updated arguments for close_all_tables_for_name
sql/sql_table.cc:
  Updated arguments for close_all_tables_for_name
  Removed test of kill, as we have already called 'ha_extra(HA_PREPARE_FOR_DROP)' and the table may be inconsistent.
sql/sql_trigger.cc:
  Updated arguments for close_all_tables_for_name
sql/sql_truncate.cc:
  For truncate that is done with drop + recreate, signal that the table will be dropped.
2012-05-16 18:44:17 +03:00
..
examples merge with 5.3 2011-10-19 21:45:18 +02:00
share mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
add_errmsg
authors.h 5.3 merge 2012-01-13 15:50:02 +01:00
client_settings.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
CMakeLists.txt MDEV-207 Install headers required to build external storage plugins 2012-05-05 08:27:17 +02:00
contributors.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
create_options.cc compilation fixes 2011-11-27 17:50:08 +01:00
create_options.h merge with 5.3 2011-10-19 21:45:18 +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 lots of post-merge changes 2011-04-25 17:22:25 +02:00
debug_sync.cc debug_sync is now a service, available to dynamically loaded plugins. 2012-03-28 19:26:00 +02:00
debug_sync.h debug_sync is now a service, available to dynamically loaded plugins. 2012-03-28 19:26:00 +02:00
derror.cc 5.3 merge 2012-01-13 15:50:02 +01:00
derror.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
des_key_file.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
des_key_file.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
discover.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
discover.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
event_data_objects.cc 5.3 merge 2012-01-13 15:50:02 +01:00
event_data_objects.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
event_db_repository.cc 5.3 merge 2012-01-13 15:50:02 +01:00
event_db_repository.h 5.3 merge 2012-01-13 15:50:02 +01:00
event_parse_data.cc 5.3 merge 2012-01-13 15:50:02 +01:00
event_parse_data.h 5.3 merge 2012-01-13 15:50:02 +01:00
event_queue.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
event_queue.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
event_scheduler.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
event_scheduler.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
events.cc 5.3 merge 2012-01-13 15:50:02 +01:00
events.h 5.5-merge 2011-07-02 22:08:51 +02:00
field.cc mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
field.h Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
field_conv.cc merge 2012-04-05 23:07:18 +02:00
filesort.cc mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
filesort.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
frm_crypt.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
frm_crypt.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
gcalc_slicescan.cc bug #977021 ST_BUFFER fails with the negative D. 2012-04-29 18:08:11 +05:00
gcalc_slicescan.h bug #901655 ST_BUFFER asserts with a coplicated shape. 2011-12-08 16:29:45 +04:00
gcalc_tools.cc 5.3 merge 2012-01-13 15:50:02 +01:00
gcalc_tools.h 5.3->5.5 merge 2011-11-27 17:46:20 +01:00
gen_lex_hash.cc 5.3 merge 2012-01-13 15:50:02 +01:00
gstream.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
gstream.h 5.3->5.5 merge 2011-11-27 17:46:20 +01:00
ha_ndbcluster.cc 5.3 merge 2012-01-13 15:50:02 +01:00
ha_ndbcluster.h mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
ha_ndbcluster_binlog.cc 5.3 merge 2012-01-13 15:50:02 +01:00
ha_ndbcluster_binlog.h Updated/added copyright headers 2012-02-16 10:48:16 +01:00
ha_ndbcluster_cond.cc Remove last traces of HAVE_NDBCLUSTER_DB define - it has not had an effect in a long time and is just confusing. 2011-02-21 11:15:29 +01: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
ha_partition.cc mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
ha_partition.h mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
handler.cc Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed in join_read_const_table on concurrent SELECT and ALTER, constant Aria table" 2012-03-20 16:04:50 +02:00
handler.h Merge of compatibility fixes 2012-04-02 13:33:16 +03:00
hash_filo.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
hash_filo.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
hostname.cc merge with 5.3 2011-10-19 21:45:18 +02:00
hostname.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
init.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
init.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
innodb_priv.h 5.3 merge 2012-05-04 07:16:38 +02:00
item.cc 5.3 merge 2012-05-04 07:16:38 +02:00
item.h mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
item_buff.cc 5.3 merge 2012-01-13 15:50:02 +01:00
item_cmpfunc.cc 5.3 merge 2012-03-28 20:25:31 +02:00
item_cmpfunc.h 5.3 merge 2012-05-04 07:16:38 +02:00
item_create.cc 5.3 merge 2012-01-13 15:50:02 +01:00
item_create.h 5.3 merge 2012-01-13 15:50:02 +01:00
item_func.cc a couple of minor post-5.5-merge cleanups 2012-03-26 12:33:49 +02:00
item_func.h Fixed some simple warnings on Windows. 2012-04-13 19:44:22 +02:00
item_geofunc.cc bug #977021 ST_BUFFER fails with the negative D. 2012-04-29 18:08:11 +05:00
item_geofunc.h 5.3->5.5 merge 2011-11-27 17:46:20 +01:00
item_row.cc 5.3 merge 2012-01-13 15:50:02 +01:00
item_row.h 5.3 merge 2012-01-13 15:50:02 +01:00
item_strfunc.cc Updated/added copyright headers 2012-02-15 17:13:47 +01:00
item_strfunc.h 5.3 merge 2012-03-06 20:46:07 +01:00
item_subselect.cc 5.3 merge 2012-05-04 07:16:38 +02:00
item_subselect.h 5.3 merge 2012-05-04 07:16:38 +02:00
item_sum.cc 5.3.4 merge 2012-02-15 18:08:08 +01:00
item_sum.h Merge 5.3->5.5. 2012-03-01 14:22:22 -08:00
item_timefunc.cc merge 2012-04-07 15:58:46 +02:00
item_timefunc.h LP993103: Wrong result with LAST_DAY('0000-00-00 00:00:00')IS NULL in WHERE condition 2012-05-02 16:53:02 +02:00
item_xmlfunc.cc mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
item_xmlfunc.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
key.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
key.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
keycaches.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
keycaches.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
lex.h Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5. 2012-03-12 00:45:18 +02:00
lex_symbol.h
lock.cc MDEV-254: Server hang with FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT 2012-05-08 14:27:44 +02:00
lock.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
log.cc mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
log.h mysql-5.5 merge 2012-01-16 20:16:35 +01:00
log_event.cc mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
log_event.h mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
log_event_old.cc Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
log_event_old.h Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" 2012-03-13 16:38:43 +02:00
log_slow.h lots of post-merge changes 2011-04-25 17:22:25 +02:00
main.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
mdl.cc MDEV-117 Assertion: prebuilt->sql_stat_start || trx->conc_state == 1 failed at row0sel.c:3933 2012-03-01 16:24:59 +01:00
mdl.h mysql-5.5 merge 2012-01-16 20:16:35 +01:00
mem_root_array.h Patch for Bug#13805127: Stored program cache produces wrong result in same THD. 2012-03-29 15:07:54 +02:00
message.h 5.3 merge 2012-01-13 15:50:02 +01:00
message.mc
message.rc
mf_iocache.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
MSG00001.bin
multi_range_read.cc 5.3 merge 2012-02-24 14:37:00 +01:00
multi_range_read.h fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00
my_decimal.cc 5.3 merge 2012-01-13 15:50:02 +01:00
my_decimal.h merge 2012-04-05 23:07:18 +02:00
mysql_install_db.cc MDEV-221 - Properly escape command line when starting mysql_install_db 2012-04-16 15:28:33 +02:00
mysql_upgrade_service.cc - Properly terminate options array with all-zero entry. 2011-05-20 01:38:42 +02:00
mysqld.cc MDEV-220 MariaDB server 5.5 GA candidate has default storage engine MyISAM 2012-04-19 04:02:28 +02:00
mysqld.h mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
mysqld_suffix.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
net_serv.cc Update copyright notices 2012-02-28 18:53:05 +01:00
nt_servc.cc Bug#11754011: 45546: START WINDOWS SERVICE, THEN EXECUTE WHAT IS NEEDED. 2011-12-13 17:44:19 +02:00
nt_servc.h Bug#11754011: 45546: START WINDOWS SERVICE, THEN EXECUTE WHAT IS NEEDED. 2011-12-13 17:44:19 +02:00
opt_index_cond_pushdown.cc 5.3 merge 2012-02-21 20:51:56 +01:00
opt_range.cc Merge mariadb 5.3->mariadb 5.5 2012-03-24 18:21:22 +01:00
opt_range.h 5.3 merge 2012-01-13 15:50:02 +01:00
opt_range_mrr.cc fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00
opt_subselect.cc 5.3 merge 2012-05-04 07:16:38 +02:00
opt_subselect.h 5.3 merge 2012-05-04 07:16:38 +02:00
opt_sum.cc Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
opt_table_elimination.cc fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00
parse_file.cc 5.3 merge 2012-05-04 07:16:38 +02:00
parse_file.h 5.3 merge 2012-05-04 07:16:38 +02:00
partition_element.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
partition_info.cc 5.3 merge 2012-01-13 15:50:02 +01:00
partition_info.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
password.c merge 2012-04-07 15:58:46 +02:00
plistsort.c Precise GIS functions added. 2011-05-04 23:20:17 +05:00
procedure.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
procedure.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
protocol.cc merge 2012-04-07 15:58:46 +02:00
protocol.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
records.cc Merge mariadb 5.3->mariadb 5.5 2012-03-24 18:21:22 +01:00
records.h 5.3->5.5 merge 2011-11-22 18:04:38 +01:00
repl_failsafe.cc 5.3 merge 2012-01-13 15:50:02 +01:00
repl_failsafe.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
replication.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
rpl_constants.h Updated/added copyright headers 2011-06-30 17:37:13 +02:00
rpl_filter.cc Make Replication filter settings dynamic. 2012-03-19 15:00:23 -07:00
rpl_filter.h Make Replication filter settings dynamic. 2012-03-19 15:00:23 -07:00
rpl_handler.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
rpl_handler.h Updated/added copyright headers 2012-02-16 10:48:16 +01:00
rpl_injector.cc mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
rpl_injector.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
rpl_mi.cc mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
rpl_mi.h mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
rpl_record.cc Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
rpl_record.h Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
rpl_record_old.cc Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
rpl_record_old.h Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
rpl_reporting.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
rpl_reporting.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
rpl_rli.cc mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
rpl_rli.h mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
rpl_tblmap.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
rpl_tblmap.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
rpl_utility.cc 5.3 merge 2012-01-13 15:50:02 +01:00
rpl_utility.h 5.3 merge 2012-01-13 15:50:02 +01:00
scheduler.cc Update copyright notices 2012-02-28 18:53:05 +01:00
scheduler.h Update copyright notices 2012-02-28 18:53:05 +01:00
set_var.cc 5.3 merge 2012-01-13 15:50:02 +01:00
set_var.h mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
sha2.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
signal_handler.cc Fixed some simple warnings on Windows. 2012-04-13 19:44:22 +02:00
slave.cc 5.3 merge 2012-05-04 07:16:38 +02:00
slave.h Merge MWL#234: @@skip_replication feature to MariaDB 5.5. 2012-03-01 12:41:49 +01:00
sp.cc 5.3 merge 2012-01-13 15:50:02 +01:00
sp.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sp_cache.cc mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
sp_cache.h mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
sp_head.cc mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
sp_head.h merge 2012-04-05 12:01:52 +02:00
sp_pcontext.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sp_pcontext.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sp_rcontext.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sp_rcontext.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
spatial.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
spatial.h 5.3 merge 2012-01-13 15:50:02 +01:00
sql_acl.cc 5.3 merge 2012-05-04 07:16:38 +02:00
sql_acl.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sql_admin.cc Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK 2012-05-16 18:44:17 +03:00
sql_admin.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_alter.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_alter.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_analyse.cc 5.3 merge 2012-01-13 15:50:02 +01:00
sql_analyse.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_array.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_audit.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_audit.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_base.cc Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK 2012-05-16 18:44:17 +03:00
sql_base.h Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK 2012-05-16 18:44:17 +03:00
sql_binlog.cc compilation warning: unused variable 2012-03-05 21:55:25 +01:00
sql_binlog.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_bitmap.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_builtin.cc.in mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_cache.cc Dependency of tests from ulong size removed. 2012-04-19 17:00:13 +03:00
sql_cache.h Dependency of tests from ulong size removed. 2012-04-19 17:00:13 +03:00
sql_callback.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_class.cc merge 2012-04-05 23:07:18 +02:00
sql_class.h Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5. 2012-03-12 00:45:18 +02:00
sql_client.cc Update copyright notices 2012-02-28 18:53:05 +01:00
sql_connect.cc merge 2012-04-05 23:07:18 +02:00
sql_connect.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_const.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_crypt.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sql_crypt.h Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sql_cursor.cc 5.3 merge 2012-01-13 15:50:02 +01:00
sql_cursor.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_db.cc 5.3 merge 2012-01-13 15:50:02 +01:00
sql_db.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_delete.cc Merge mariadb 5.3->mariadb 5.5 2012-03-24 18:21:22 +01:00
sql_delete.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_derived.cc Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
sql_derived.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_do.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_do.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_error.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
sql_error.h merge with 5.3 2011-10-19 21:45:18 +02:00
sql_expression_cache.cc don't forget to call ha_index_end before destroying the handler 2011-10-19 22:52:43 +02:00
sql_expression_cache.h fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00
sql_handler.cc Merge mariadb 5.3->mariadb 5.5 2012-03-24 18:21:22 +01:00
sql_handler.h merge with 5.3 2011-10-19 21:45:18 +02:00
sql_help.cc 5.3 merge 2012-01-13 15:50:02 +01:00
sql_help.h Updated/added copyright headers 2011-06-30 17:46:53 +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 Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5. 2012-03-12 00:45:18 +02:00
sql_insert.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_join_cache.cc Merge mariadb 5.3->mariadb 5.5 2012-03-24 18:21:22 +01:00
sql_join_cache.h 5.3 merge 2012-02-21 20:51:56 +01:00
sql_lex.cc 5.3 merge 2012-05-04 07:16:38 +02:00
sql_lex.h mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
sql_lifo_buffer.h fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00
sql_list.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_list.h merge 2012-04-07 15:58:46 +02:00
sql_load.cc 5.3.4 merge 2012-02-15 18:08:08 +01:00
sql_load.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_locale.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_locale.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_manager.cc 5.3.4 merge 2012-02-15 18:08:08 +01:00
sql_manager.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_parse.cc debug_sync is now a service, available to dynamically loaded plugins. 2012-03-28 19:26:00 +02:00
sql_parse.h 5.3->5.5 merge 2011-11-22 18:04:38 +01:00
sql_partition.cc Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK 2012-05-16 18:44:17 +03:00
sql_partition.h mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
sql_partition_admin.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_partition_admin.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_plist.h Fix for bug#12695572 - "IMPROVE MDL PERFORMANCE IN PRE-VISTA 2011-11-15 22:00:14 +04:00
sql_plugin.cc mdev-224 plugin usage statistics in the feedback reports 2012-04-18 04:00:08 +02:00
sql_plugin.h mdev-224 plugin usage statistics in the feedback reports 2012-04-18 04:00:08 +02:00
sql_plugin_services.h debug_sync is now a service, available to dynamically loaded plugins. 2012-03-28 19:26:00 +02:00
sql_prepare.cc mysql 5.5.23 merge 2012-04-10 08:28:13 +02:00
sql_prepare.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_priv.h Merge 2012-03-02 22:52:03 -08:00
sql_profile.cc mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
sql_profile.h Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sql_reload.cc mysql-5.5 merge 2012-01-16 20:16:35 +01:00
sql_reload.h BUG#46166 2010-12-07 16:11:13 +00:00
sql_rename.cc 5.3 merge 2012-01-13 15:50:02 +01:00
sql_rename.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_repl.cc debug_sync is now a service, available to dynamically loaded plugins. 2012-03-28 19:26:00 +02:00
sql_repl.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_select.cc 5.3 merge 2012-05-04 07:16:38 +02:00
sql_select.h 5.3 merge 2012-05-04 07:16:38 +02:00
sql_servers.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sql_servers.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_show.cc bug fix: I_S plugins were not locked when used 2012-04-17 14:25:08 +02:00
sql_show.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_signal.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_signal.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_sort.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_state.c
sql_string.cc Updated/added copyright headers 2012-02-15 17:13:47 +01:00
sql_string.h 5.3 merge 2012-01-13 15:50:02 +01:00
sql_table.cc Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK 2012-05-16 18:44:17 +03:00
sql_table.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_tablespace.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
sql_tablespace.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_test.cc Fixed some simple warnings on Windows. 2012-04-13 19:44:22 +02:00
sql_test.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_time.cc merge 2011-11-03 23:39:53 +01:00
sql_time.h merge 2011-11-03 23:39:53 +01:00
sql_trigger.cc Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK 2012-05-16 18:44:17 +03:00
sql_trigger.h 5.3 merge 2012-01-13 15:50:02 +01:00
sql_truncate.cc Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close on DROP TABLE under LOCK 2012-05-16 18:44:17 +03:00
sql_truncate.h Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.c 2010-10-06 11:34:28 -03:00
sql_udf.cc mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
sql_udf.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_union.cc Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5. 2012-03-12 00:45:18 +02:00
sql_union.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_update.cc 5.3 merge 2012-05-04 07:16:38 +02:00
sql_update.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_view.cc 5.3 merge 2012-05-04 07:16:38 +02:00
sql_view.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_yacc.yy merge 2012-04-05 23:07:18 +02:00
strfunc.cc Initail merge with MySQL 5.1 (XtraDB still needs to be merged) 2011-11-21 19:13:14 +02:00
strfunc.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
structs.h Merge MWL #247 from mariadb 5.3 -> mariadb 5.5. 2012-03-02 15:03:20 -08:00
sys_vars.cc Dependency of tests from ulong size removed. 2012-04-19 17:00:13 +03:00
sys_vars.h mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
sys_vars_shared.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
table.cc 5.3 merge 2012-05-04 07:16:38 +02:00
table.h 5.3 merge 2012-05-04 07:16:38 +02:00
thr_malloc.cc 5.3 merge 2012-01-13 15:50:02 +01:00
thr_malloc.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
threadpool.h Added copiright, some more comments 2012-02-17 23:27:15 +01:00
threadpool_common.cc MDEV-246 - Aborted_clients incremented during ordinary connection close 2012-05-03 02:47:06 +02:00
threadpool_unix.cc Threadpool - use EV_ONESHOT with kevent, to prevent race condition when 2 2012-04-12 01:40:44 +02:00
threadpool_win.cc MDEV-246 - Aborted_clients incremented during ordinary connection close 2012-05-03 02:47:06 +02:00
transaction.cc This patch fixes the bug#13737343 (formerly known as 64374): XA TRANSACTIONS 2012-03-15 15:10:57 +06:00
transaction.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
tzfile.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
tztime.cc 5.3 merge 2012-01-13 15:50:02 +01:00
tztime.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
udf_example.c 5.3 merge 2012-01-13 15:50:02 +01:00
udf_example.def Patch set contributed by Alex Budovski (MCA) 2010-01-29 20:42:22 +02:00
uniques.cc Merge with 5.2. 2011-12-11 11:34:44 +02:00
unireg.cc 5.3 merge 2012-01-13 15:50:02 +01:00
unireg.h merge 2012-04-07 15:58:46 +02:00
winservice.c Merge 5.3->5.5 2012-03-17 01:26:58 -07:00
winservice.h fix the include guards and add missing gplv2 headers 2012-02-17 12:19:38 +01:00