mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
Jan Lindström 4f85baab95 Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. 
------------------------------------------------------------
revno: 3942
committer: Seppo Jaakola <seppo.jaakola@codership.com>
branch nick: wsrep-5.5-23
timestamp: Thu 2013-11-07 17:37:10 +0200
message:
  References: lp:1248921 - checking if index is foreign earlier to adhere to lat
ch order protocol
------------------------------------------------------------
revno: 3941
fixes bug: https://launchpad.net/bugs/1248908
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Thu 2013-11-07 14:31:04 +0200
message:
  References lp:1248908 - Fixed access to trx sys header
    
  Pass trx sys header as argument for trx_sys_update_wsrep_checkpoint()
  and trx_sys_update_mysql_binlog_offset() to avoid successive calls
  to trx_sysf_get().
------------------------------------------------------------
revno: 3940
fixes bug: https://launchpad.net/bugs/1244100
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Tue 2013-11-05 15:31:12 +0200
message:
  References lp:1244100 - assign value for check_purge before return
------------------------------------------------------------
revno: 3939
fixes bug: https://launchpad.net/bugs/1247978
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Tue 2013-11-05 01:01:36 +0200
message:
  References lp:1247978 - force release transactional MDL locks if wsrep is on a
nd no active transaction at the end of mysql_execute_command()
------------------------------------------------------------
revno: 3938
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-11-03 20:48:06 +0400
message:
  References lp:1232789 - fix FLUSH STATUS zeroes up wsrep_cluster_size and wsre
p_local_index
------------------------------------------------------------
revno: 3937  5kB/s - 
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-11-03 17:06:31 +0400
message:
  References lp:587170 - reset auto_increment_* vars to defaults for TOI operati
ons
------------------------------------------------------------
revno: 3936
committer: Vladislav Klyachin <vladislav.klyachin@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-11-03 00:10:45 +0400
message:
  References lp:1072839 - fix for memory leaks with wsrep variables
------------------------------------------------------------
revno: 3935
committer: Seppo Jaakola <seppo.jaakola@codership.com>
branch nick: wsrep-5.5-23
timestamp: Wed 2013-10-30 14:34:32 +0200
message:
  References: lp:1246257 - skipping replication for CREATE TEMPORARY TABLE LIKE.
..  constructs
------------------------------------------------------------
revno: 3934  6kB/s \ 
fixes bug: https://launchpad.net/bugs/1241760
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Mon 2013-10-28 11:01:53 +0200
message:
  References lp:1241760 - save thd->db to wsrep_thd_shadow before replay
------------------------------------------------------------
revno: 3933
fixes bug: https://launchpad.net/bugs/1206129
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-10-27 18:15:12 +0200
message:
  References lp:1206129 - check binlog_hton->commit() return value, call wsrep_p
ost_commit() instead of wsrep_cleanup_transaction()
------------------------------------------------------------
revno: 3932
fixes bug: https://launchpad.net/bugs/1244661
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-10-27 13:14:02 +0200
message:
  References lp:1244661 - added wsrep_register_hton() to trans_rollback_implicit
()
------------------------------------------------------------
revno: 3931
fixes bug: https://launchpad.net/bugs/1244667
committer: Teemu Ollakka <teemu.ollakka@codership.com>
branch nick: 5.5-23
timestamp: Sun 2013-10-27 11:08:49 +0200
message:
  References lp:1244667 - restore thd->server_status after replay
2013-11-25 14:04:49 +02:00
..
examples merge with 5.3 2011-10-19 21:45:18 +02:00
share mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
add_errmsg WL#751 Error message construction, backport 2009-10-15 17:23:43 +05:00
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 mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
contributors.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
create_options.cc 5.3 merge 2012-10-18 23:33:06 +02:00
create_options.h merge with 5.3 2011-10-19 21:45:18 +02:00
custom_conf.h Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
datadict.cc fix an old bug where dd_frm_type() could incorrectly determine the table type 2013-08-28 22:16:13 +02:00
datadict.h lots of post-merge changes 2011-04-25 17:22:25 +02:00
db.opt Bug#16062056 REMOVE THE "DUMMY.BAK" FILE FROM THE TEST DATABASE, AND ADD DB.OPT 2013-02-25 10:42:40 +01:00
debug_sync.cc mysql-5.5.33 merge 2013-09-06 22:31:30 +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 Better error message when using --language or --log-bin 2012-09-07 17:05:17 +03:00
derror.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
des_key_file.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
des_key_file.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
discover.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +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 Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
event_db_repository.cc MDEV-4332 Increase username length from 16 characters 2013-04-18 22:17:29 +02:00
event_db_repository.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +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 Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
event_queue.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
event_scheduler.cc Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
event_scheduler.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
events.cc Initial push of codership-wsrep API implementation for MariaDB. 2012-04-13 01:33:24 +03:00
events.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
field.cc mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
field.h Merge from 5.3 2013-09-10 10:08:11 +04:00
field_conv.cc Merging from 5.3 2013-07-08 16:49:42 +04:00
filesort.cc mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
filesort.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
frm_crypt.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01: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 Merge MySQL 5.1.66 -> MariaDB 5.1.65 2012-11-06 11:52:55 +02:00
gstream.cc Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
gstream.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
ha_ndbcluster.cc 5.3 merge 2012-01-13 15:50:02 +01:00
ha_ndbcluster.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
ha_ndbcluster_binlog.cc Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
ha_ndbcluster_binlog.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
ha_ndbcluster_cond.cc Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
ha_ndbcluster_cond.h Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
ha_ndbcluster_tables.h Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
ha_partition.cc mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
ha_partition.h mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
handler.cc Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23 2013-11-25 11:09:48 +02:00
handler.h mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
hash_filo.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
hash_filo.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
hostname.cc mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
hostname.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
init.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
init.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
innodb_priv.h mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
item.cc MDEV-4724 Some temporal functions do not preserve microseconds 2013-09-13 14:43:10 +04:00
item.h MDEV-4724 Some temporal functions do not preserve microseconds 2013-09-13 14:43:10 +04:00
item_buff.cc 5.3 merge 2012-01-13 15:50:02 +01:00
item_cmpfunc.cc Merge from 5.3 2013-09-10 10:08:11 +04:00
item_cmpfunc.h Merge from 5.3 2013-09-10 10:08:11 +04:00
item_create.cc 5.3 merge 2013-03-27 10:03:28 +01:00
item_create.h 5.3 merge 2012-01-13 15:50:02 +01:00
item_func.cc mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
item_func.h MDEV-4724 Some temporal functions do not preserve microseconds 2013-09-13 14:43:10 +04:00
item_geofunc.cc 5.3 merge 2013-03-27 10:03:28 +01:00
item_geofunc.h mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
item_row.cc Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
item_row.h 5.3 merge 2012-01-13 15:50:02 +01:00
item_strfunc.cc Merging from 5.3 2013-07-08 16:49:42 +04:00
item_strfunc.h mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
item_subselect.cc MDEV-5012 Server crashes in Item_ref::real_item on EXPLAIN with select subqueries or views, constant table, derived_merge+derived_with_keys 2013-09-13 23:42:00 +02:00
item_subselect.h MDEV-4284 Assertion `cmp_items[(uint)cmp_type]' fails in sql/item_cmpfunc.cc 2013-03-17 11:41:25 +01:00
item_sum.cc mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
item_sum.h mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
item_timefunc.cc Merge from 5.3 2013-09-16 10:51:03 +04:00
item_timefunc.h MDEV-4724 Some temporal functions do not preserve microseconds 2013-09-13 14:43:10 +04:00
item_xmlfunc.cc 5.2 -> 5.3 2013-02-28 21:48:47 +01:00
item_xmlfunc.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
key.cc mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
key.h mysql-5.5.31 merge 2013-05-07 13:05:09 +02: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 Added function last_value() which returns the last value but evalutes all arguments as a side effect. 2012-09-05 18:23:51 +03:00
lex_symbol.h Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
lock.cc References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysql 2012-11-28 17:38:32 +02:00
lock.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
log.cc Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. 2013-11-25 14:04:49 +02:00
log.h References: lp:1066784 - Merged with MariaDB 5.5.28a 2012-11-30 13:36:29 +02:00
log_event.cc mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
log_event.h mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
log_event_old.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
log_event_old.h mysql-5.5.32 merge 2013-07-16 19:09:54 +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 References: lp:1233353 - releasing explicit MDL locks for BF aborted transactions 2013-09-30 23:14:31 +03:00
mdl.h Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. 2013-11-25 14:04:49 +02:00
mem_root_array.h Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
message.h 5.3 merge 2012-01-13 15:50:02 +01:00
message.mc
message.rc
mf_iocache.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
MSG00001.bin
multi_range_read.cc -Run test suite with smaller aria keybuffer size (to make it possible to run more tests in parallel) 2013-06-05 23:53:35 +03: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 mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
mysql_install_db.cc Small mysql_install_db.exe fixes 2013-05-09 22:21:07 +02:00
mysql_upgrade_service.cc - Properly terminate options array with all-zero entry. 2011-05-20 01:38:42 +02:00
mysqld.cc Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. 2013-11-25 14:04:49 +02:00
mysqld.h mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
mysqld_suffix.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
net_serv.cc mysql-5.5.32 merge 2013-07-16 19:09:54 +02: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 tokudb patches for prepare range scan 2013-09-09 14:00:18 +02:00
opt_range.h Merge 5.3 -> 5.5 2013-04-03 18:51:29 +04:00
opt_range_mrr.cc MDEV-3934 Assertion `((keypart_map+1) & keypart_map) == 0' failed in _mi_pack_key with an index on a POINT column 2013-01-20 14:06:33 +01:00
opt_subselect.cc Merge 5.3 -> 5.5 2013-09-12 13:54:46 +04:00
opt_subselect.h Merge 5.3 -> 5.5 2013-09-12 13:54:46 +04:00
opt_sum.cc MDEV-4243 Warnings/errors while compiling with clang 2013-03-28 20:04:14 +01:00
opt_table_elimination.cc MDEV-4840: Wrong result (missing rows) on LEFT JOIN with InnoDB tables 2013-08-22 14:12:10 +04: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.31 merge 2013-05-07 13:05:09 +02:00
partition_info.cc mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
partition_info.h Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING 2013-01-30 17:51:52 +01:00
password.c Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
plistsort.c Precise GIS functions added. 2011-05-04 23:20:17 +05:00
procedure.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
procedure.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
protocol.cc Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 2013-08-21 16:34:31 +03:00
protocol.h Merge with 5.2. 2011-12-11 11:34:44 +02:00
records.cc tokudb patches for prepare range scan 2013-09-09 14:00:18 +02:00
records.h 5.3->5.5 merge 2011-11-22 18:04:38 +01:00
repl_failsafe.cc Merge from 5.3 2012-08-24 15:29:01 +02:00
repl_failsafe.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01: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 mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
rpl_filter.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01: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 Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
rpl_mi.cc mysql-5.5.22 merge 2012-03-28 01:04:46 +02:00
rpl_mi.h MDEV-4332 Increase username length from 16 characters 2013-04-18 22:17:29 +02:00
rpl_record.cc References MDEV-4404 - Added log message to catch information of log event corruption 2013-08-21 16:37:22 +03: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 Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01: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 strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) 2013-04-17 19:42:34 +02:00
rpl_rli.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
rpl_tblmap.cc mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
rpl_tblmap.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
rpl_utility.cc Fixed MySQL bug #69861 LAST_INSERT_ID is replicated incorrectly if replication filters are used 2013-08-27 19:18:04 +03:00
rpl_utility.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
scheduler.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
scheduler.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
set_var.cc mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
set_var.h Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 2013-08-21 16:34:31 +03:00
sha2.cc Updated/added copyright headers 2011-06-30 17:46:53 +02:00
signal_handler.cc mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
slave.cc Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 2013-08-21 16:34:31 +03:00
slave.h Merge MWL#234: @@skip_replication feature to MariaDB 5.5. 2012-03-01 12:41:49 +01:00
sp.cc References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03: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 Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sp_head.cc mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
sp_head.h Updated/added copyright headers. 2013-02-25 15:26:00 +01: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 mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
sp_rcontext.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
spatial.cc Merge 5.3->5.5. 2013-08-18 19:58:51 -07:00
spatial.h Merge 5.3->5.5. 2013-08-18 19:58:51 -07:00
sql_acl.cc mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
sql_acl.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sql_admin.cc References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
sql_admin.h Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING 2013-01-30 17:51:52 +01:00
sql_alter.cc Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. 2013-11-25 14:04:49 +02:00
sql_alter.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_analyse.cc mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
sql_analyse.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_array.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_audit.cc MDEV-4472 Audit-plugin. Server-related part of the task. 2013-09-09 16:56:35 +05:00
sql_audit.h MDEV-4472 Audit-plugin. Server-related part of the task. 2013-09-09 16:56:35 +05:00
sql_base.cc References: lp:1233353 - releasing explicit MDL locks for BF aborted transactions 2013-09-30 23:14:31 +03:00
sql_base.h Automatic merge 2013-03-01 18:09:06 +02:00
sql_binlog.cc mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
sql_binlog.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_bitmap.h mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
sql_builtin.cc.in Initial push of codership-wsrep API implementation for MariaDB. 2012-04-13 01:33:24 +03:00
sql_cache.cc Fix possible race condition in Query cache. 2013-08-05 17:34:38 +03:00
sql_cache.h MDEV-249 QUERY CACHE INFORMATION 2013-03-20 20:56:14 +01:00
sql_callback.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_class.cc Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23 2013-11-25 11:09:48 +02:00
sql_class.h Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. 2013-11-25 14:04:49 +02:00
sql_client.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_connect.cc References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
sql_connect.h Bug#14003080:65104: MAX_USER_CONNECTIONS WITH PROCESSLIST EMPTY 2012-05-28 11:14:43 +05:30
sql_const.h MDEV-4243 : remove several clang warnings. 2013-03-29 14:56:09 +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 MDEV-4978 - Server cursor is broken with blobs in the select list, 2013-09-06 15:59:19 +04:00
sql_cursor.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_db.cc mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
sql_db.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_delete.cc References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
sql_delete.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_derived.cc 5.3 -> 5.5 Merge 2013-06-17 20:33:36 +03:00
sql_derived.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_do.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_do.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_error.cc mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
sql_error.h mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
sql_expression_cache.cc mdev-4173: Wrong result (extra row) with semijoin=on, joins in outer query, LEFT JOIN in the subquery 2013-07-16 09:22:17 +04: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 mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
sql_handler.h merge with 5.3 2011-10-19 21:45:18 +02:00
sql_help.cc mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
sql_help.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_hset.h Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01:00
sql_insert.cc Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 2013-08-21 16:34:31 +03:00
sql_insert.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_join_cache.cc 5.3->5.5 merge 2013-03-10 12:46:56 +01:00
sql_join_cache.h 5.3 merge 2012-02-21 20:51:56 +01:00
sql_lex.cc mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
sql_lex.h MDEV-4902 - sql_yacc.yy incompatible with bison 3 2013-08-30 11:00:29 +04: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 Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_list.h 5.3->5.5 merge 2013-02-28 22:47:29 +01:00
sql_load.cc mysql-5.5.33 merge 2013-09-06 22:31:30 +02: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 Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. 2013-11-25 14:04:49 +02:00
sql_parse.h References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
sql_partition.cc mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
sql_partition.h mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
sql_partition_admin.cc Bug#14653504 CRASH WHEN TRUNCATING PARTITIONS FROM A VIEW! 2013-02-26 17:57:05 +05:30
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 mariadb-5.5.33 merge 2013-09-18 12:00:23 +02:00
sql_plugin.h merge with MySQL 5.5.27 2012-08-09 17:22:00 +02:00
sql_plugin_compat.h strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) 2013-04-17 19:42:34 +02:00
sql_plugin_services.h MDEV-4472 Audit-plugin. Server-related part of the task. 2013-09-09 16:56:35 +05:00
sql_prepare.cc References: MDEV-4572 - merge with mariaDB 5.5.31 2013-05-26 11:26:58 +03:00
sql_prepare.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_priv.h 5.3 merge 2013-01-15 19:07:46 +01:00
sql_profile.cc 5.3 merge 2013-01-15 19:07:46 +01:00
sql_profile.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
sql_reload.cc references lp:1011983 2012-06-12 16:34:18 +03:00
sql_reload.h BUG#46166 2010-12-07 16:11:13 +00:00
sql_rename.cc mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
sql_rename.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_repl.cc Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 2013-08-21 16:34:31 +03:00
sql_repl.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_select.cc Merge 5.3->5.5 2013-09-15 17:30:53 -07:00
sql_select.h MDEV-4978 - Server cursor is broken with blobs in the select list, 2013-09-06 15:59:19 +04:00
sql_servers.cc Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sql_servers.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
sql_show.cc Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 2013-08-21 16:34:31 +03:00
sql_show.h Updated/added copyright headers. 2013-02-25 15:26:00 +01:00
sql_signal.cc mysql-5.5.29 merge 2013-01-15 19:13:32 +01:00
sql_signal.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_sort.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_state.c mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
sql_string.cc mysql-5.5.31 merge 2013-05-07 13:05:09 +02:00
sql_string.h mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
sql_table.cc Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. 2013-11-25 14:04:49 +02:00
sql_table.h mysql-5.5.33 merge 2013-09-06 22:31:30 +02: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 Fix a compile warning on NetBSD 2013-06-01 21:33:26 +02:00
sql_test.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_time.cc Merging from 5.3 2013-07-08 16:49:42 +04:00
sql_time.h Merge from 5.3 2013-06-28 15:20:40 +04:00
sql_trigger.cc Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 2013-08-21 16:34:31 +03:00
sql_trigger.h 5.3 merge 2012-01-13 15:50:02 +01:00
sql_truncate.cc References: MDEV-4572 - merge with mariaDB 5.5.30 2013-05-24 15:29:01 +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 Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_union.cc MDEV-4978 - Server cursor is broken with blobs in the select list, 2013-09-06 15:59:19 +04:00
sql_union.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_update.cc Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 2013-08-21 16:34:31 +03:00
sql_update.h mysql-5.5.18 merge 2011-11-03 19:17:05 +01:00
sql_view.cc mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
sql_view.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_yacc.yy mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
strfunc.cc Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 15:53:48 +01: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 Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. 2013-11-25 14:04:49 +02:00
sys_vars.h mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
sys_vars_shared.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
table.cc mariadb-5.5.33a merge 2013-09-27 13:48:58 +03:00
table.h mysql-5.5.33 merge 2013-09-06 22:31:30 +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-4685 Compile error on LFS 2013-06-22 14:02:03 +02:00
threadpool_unix.cc MDEV-4685 Compile error on LFS 2013-06-22 14:02:03 +02:00
threadpool_win.cc MDEV-531 : Warning: Forcing close of thread ... in rpl_binlog_index 2012-11-02 10:43:52 +01:00
transaction.cc Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23. 2013-11-25 14:04:49 +02:00
transaction.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
tzfile.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
tztime.cc References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3874..3878 2013-06-15 16:15:45 +03: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 5.3->5.5 2013-01-23 15:18:05 -08:00
unireg.cc Merge 5.3->5.5. 2012-06-24 09:10:11 -07:00
unireg.h mysql-5.5.32 merge 2013-07-16 19:09:54 +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
wsrep_check_opts.cc Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903 2013-08-21 17:17:30 +03:00
wsrep_hton.cc Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23 2013-11-25 11:09:48 +02:00
wsrep_mysqld.cc Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23 2013-11-25 11:09:48 +02:00
wsrep_mysqld.h Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23 2013-11-25 11:09:48 +02:00
wsrep_notify.cc remerging wsrep files from lp:codership-mysql 2013-02-05 16:54:50 +02:00
wsrep_priv.h remerging wsrep files from lp:codership-mysql 2013-02-05 16:54:50 +02:00
wsrep_sst.cc Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903 2013-08-21 17:17:30 +03:00
wsrep_utils.cc Merge revisions 3907--3914 from lp:~codership/codership-mysql/5.5-23 2013-09-26 16:43:49 +03:00
wsrep_var.cc Merge revisions 3907--3914 from lp:~codership/codership-mysql/5.5-23 2013-09-26 16:43:49 +03:00