database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity
Files
89b2bc42f405e20af11423b0cf83032fcb2a3de4
mariadb/sql
History
Nirbhay Choubey 89b2bc42f4 Merge revisions from maria/5.5 
bzr merge -r4388 lp:maria/5.5
2014-12-16 20:07:34 -05:00
..
examples
merge with 5.3
2011-10-19 21:45:18 +02:00
share
2 typo fixed
2014-05-27 09:45:01 +03: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
bzr merge -rtag:mariadb-5.5.40 maria/5.5
2014-10-09 17:25:08 -04: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
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
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
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
5.2 merge
2014-03-16 21:03:01 +01:00
discover.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
event_data_objects.cc
bzr merge -r3997..4010 codership-mysql/5.5
2014-08-06 15:45:53 -04:00
event_data_objects.h
5.1 merge
2014-03-16 13:59:44 +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
5.1 merge
2014-03-16 13:59:44 +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
5.2 merge
2014-03-16 21:03:01 +01:00
event_queue.h
5.2 merge
2014-03-16 21:03:01 +01:00
event_scheduler.cc
MDEV-6774 - Deadlock between SELECT, DROP TABLE, SHOW STATUS and
2014-09-25 10:43:11 +04:00
event_scheduler.h
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
events.cc
bzr merge -r3985..3997 codership/5.5
2014-06-10 17:00:32 -04:00
events.h
5.1 merge
2014-03-16 13:59:44 +01:00
field_conv.cc
5.2 merge
2014-03-16 21:03:01 +01:00
field.cc
Merge 5.3->5.5
2014-06-04 21:53:15 +04:00
field.h
5.3 merge
2014-08-01 16:51:12 +02:00
filesort.cc
MDEV-6434: Wrong result (extra rows) with ORDER BY, multiple-column index, InnoDB
2014-07-22 15:52:49 +04: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
5.2 merge
2014-03-16 21:03:01 +01:00
gstream.h
5.2 merge
2014-03-16 21:03:01 +01:00
ha_ndbcluster_binlog.cc
5.2 merge
2014-03-16 21:03:01 +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
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
ha_ndbcluster_cond.h
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
ha_ndbcluster_tables.h
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
ha_ndbcluster.cc
5.3 merge
2012-01-13 15:50:02 +01:00
ha_ndbcluster.h
5.2 merge
2014-03-16 21:03:01 +01:00
ha_partition.cc
bzr merge -rtag:mariadb-5.5.40 maria/5.5
2014-10-09 17:25:08 -04:00
ha_partition.h
Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.
2014-04-16 12:13:43 +03:00
handler.cc
bzr merge -rtag:mariadb-5.5.40 maria/5.5
2014-10-09 17:25:08 -04:00
handler.h
bzr merge -rtag:mariadb-5.5.38 maria/5.5
2014-06-10 16:04:26 -04:00
hash_filo.cc
mysql-5.1.73 merge
2014-03-15 18:24:15 +01:00
hash_filo.h
5.1 merge
2014-03-16 13:59:44 +01:00
hostname.cc
mysql-5.1.73 merge
2014-03-15 18:24:15 +01: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_buff.cc
5.3 merge
2012-01-13 15:50:02 +01:00
item_cmpfunc.cc
MDEV-5459 Illegal mix of collations for datetime
2014-04-28 17:01:58 +04:00
item_cmpfunc.h
5.2 merge
2014-03-16 21:03:01 +01: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
Local merge of mariadb-5.5.39
2014-08-06 14:06:11 -04:00
item_func.h
MDEV-7113 difference between check_vcol_func_processor and check_partition_func_processor
2014-11-18 15:42:40 +01:00
item_geofunc.cc
5.3 merge
2014-02-22 22:51:20 +01:00
item_geofunc.h
5.2 merge
2014-03-16 21:03:01 +01:00
item_row.cc
5.2 merge
2014-03-16 21:03:01 +01:00
item_row.h
5.3 merge
2012-01-13 15:50:02 +01:00
item_strfunc.cc
MDEV-4513 Valgrind warnings (Conditional jump or move depends on uninitialised value) in inflate on UNCOMPRESS
2014-11-18 15:42:48 +01:00
item_strfunc.h
MDEV-5745 analyze MySQL fix for bug#12368495
2014-07-28 12:47:14 +04:00
item_subselect.cc
MDEV-6289 : Unexpected results when querying information_schema
2014-07-23 19:53:29 +04:00
item_subselect.h
5.3 merge
2014-02-14 14:09:29 +01:00
item_sum.cc
MDEV-6743 crash in GROUP_CONCAT(IF () ORDER BY 1)
2014-10-03 23:04:25 +02:00
item_sum.h
5.2 merge
2014-03-16 21:03:01 +01:00
item_timefunc.cc
DEV-7221 from_days fails after null value
2014-12-16 15:33:13 +04:00
item_timefunc.h
MDEV-7113 difference between check_vcol_func_processor and check_partition_func_processor
2014-11-18 15:42:40 +01:00
item_xmlfunc.cc
5.1 merge
2014-03-16 13:59:44 +01:00
item_xmlfunc.h
5.1 merge
2014-03-16 13:59:44 +01:00
item.cc
mysql-5.5.40
2014-10-06 19:53:55 +02:00
item.h
MDEV-6855 Assertion `cond_type == Item::FUNC_ITEM' failed in check_group_min_max_predicates with GROUP BY, aggregate in WHERE SQ, multi-part key
2014-12-15 17:13:47 +02:00
key.cc
MySQL-5.5.36 merge
2014-02-17 11:00:51 +01:00
key.h
MySQL-5.5.36 merge
2014-02-17 11:00:51 +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_symbol.h
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
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
lock.cc
bzr merge -rtag:mariadb-5.5.38 maria/5.5
2014-06-10 16:04:26 -04:00
lock.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
log_event_old.cc
Bug#18432495:RBR REPLICATION SLAVE CRASHES WHEN DELETE
2014-06-16 10:06:44 +05:30
log_event_old.h
5.2 merge
2014-03-16 21:03:01 +01:00
log_event.cc
bzr merge -rtag:mariadb-5.5.40 maria/5.5
2014-10-09 17:25:08 -04:00
log_event.h
mysql-5.5.37 selective merge
2014-03-27 22:26:58 +01:00
log_slow.h
lots of post-merge changes
2011-04-25 17:22:25 +02:00
log.cc
bzr merge -rtag:mariadb-5.5.40 maria/5.5
2014-10-09 17:25:08 -04:00
log.h
Local merge of mariadb-5.5.39
2014-08-06 14:06:11 -04:00
main.cc
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
mdl.cc
* Merged the missing revision 3934 from
2014-02-05 00:28:11 -05: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
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
message.h
5.3 merge
2012-01-13 15:50:02 +01:00
message.mc
…
message.rc
…
mf_iocache.cc
mysql-5.1.73 merge
2014-03-15 18:24:15 +01:00
MSG00001.bin
…
multi_range_read.cc
MDEV-7068: MRR accessing uninitialised bytes, test case failure main.innodb_mrr
2014-11-13 14:12:41 +03:00
multi_range_read.h
Merge 5.3->5.5
2014-10-29 13:22:48 +03:00
my_decimal.cc
5.3 merge
2012-01-13 15:50:02 +01:00
my_decimal.h
5.2 merge
2014-03-16 21:03:01 +01: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_suffix.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
mysqld.cc
MDEV-6924 : Server crashed on CREATE TABLE ... SELECT
2014-11-17 09:55:53 -05:00
mysqld.h
bzr merge -rtag:mariadb-5.5.40 maria/5.5
2014-10-09 17:25:08 -04:00
net_serv.cc
5.2 merge
2014-03-16 21:03:01 +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_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_range.cc
MDEV-6855 Assertion `cond_type == Item::FUNC_ITEM' failed in check_group_min_max_predicates with GROUP BY, aggregate in WHERE SQ, multi-part key
2014-12-15 17:13:47 +02:00
opt_range.h
MDEV-6434: Wrong result (extra rows) with ORDER BY, multiple-column index, InnoDB
2014-07-22 15:52:49 +04:00
opt_subselect.cc
5.3 merge
2014-02-22 22:51:20 +01:00
opt_subselect.h
Merge 5.3->5.5
2014-02-10 17:00:51 -08:00
opt_sum.cc
MDEV-5257: MIN/MAX Optimization (Select tables optimized away) does not work for DateTime
2013-11-12 17:37:32 +04:00
opt_table_elimination.cc
Merge 5.3 -> 5.5
2013-12-02 15:17:21 +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.1.73 merge
2014-03-15 18:24:15 +01:00
partition_info.cc
MDEV-5421 Assertion `! is_set()' fails on INSERT IGNORE when a table has no partition for a value
2014-01-23 00:03:05 +01:00
partition_info.h
MySQL-5.5.36 merge
2014-02-17 11:00:51 +01:00
password.c
5.1 merge
2014-03-16 13:59:44 +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
5.2 merge
2014-03-16 21:03:01 +01:00
protocol.cc
Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.
2014-04-16 12:13:43 +03:00
protocol.h
MDEV-5138 Numerous test failures in "mtr --ps --embedded".
2014-04-15 18:08:33 +05:00
records.cc
5.2 merge
2014-03-16 21:03:01 +01: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
Bug#17638477 UNINSTALL AND INSTALL SEMI-SYNC PLUGIN CAUSES SLAVES TO BREAK
2014-08-03 12:45:14 +02:00
rpl_constants.h
Updated/added copyright headers
2011-06-30 17:37:13 +02:00
rpl_filter.cc
5.1 merge
2014-03-16 13:59:44 +01:00
rpl_filter.h
5.1 merge
2014-03-16 13:59:44 +01:00
rpl_handler.cc
Bug#17638477 UNINSTALL AND INSTALL SEMI-SYNC PLUGIN CAUSES SLAVES TO BREAK
2014-08-03 12:45:14 +02:00
rpl_handler.h
Bug#17638477 UNINSTALL AND INSTALL SEMI-SYNC PLUGIN CAUSES SLAVES TO BREAK
2014-08-03 12:45:14 +02:00
rpl_injector.cc
mysql-5.5.22 merge
2012-03-28 01:04:46 +02:00
rpl_injector.h
mysql-5.1.73 merge
2014-03-15 18:24:15 +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_old.cc
Merge 5.3->5.5
2012-03-17 01:26:58 -07:00
rpl_record_old.h
5.2 merge
2014-03-16 21:03:01 +01:00
rpl_record.cc
s/#if/#ifdef
2014-05-27 11:04:42 -04:00
rpl_record.h
MySQL-5.5.36 merge
2014-02-17 11:00:51 +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
5.2 merge
2014-03-16 21:03:01 +01:00
rpl_rli.h
5.2 merge
2014-03-16 21:03:01 +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
5.2 merge
2014-03-16 21:03:01 +01:00
rpl_utility.h
mysql-5.1.73 merge
2014-03-15 18:24:15 +01:00
scheduler.cc
mysql-5.5.39 merge
2014-08-02 21:26:16 +02:00
scheduler.h
MDEV-5706 MariaDB does not build on hurd-i386
2014-07-25 14:15:33 +02:00
set_var.cc
5.2 merge
2014-03-16 21:03:01 +01:00
set_var.h
5.2 merge
2014-03-16 21:03:01 +01:00
sha2.cc
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
signal_handler.cc
5.2 merge
2014-03-16 21:03:01 +01:00
slave.cc
Local merge of mariadb-5.5.39
2014-08-06 14:06:11 -04:00
slave.h
remove unused (obsolete) declarations from slave.h
2014-09-19 09:21:51 +02:00
sp_cache.cc
mysql-5.5.22 merge
2012-03-28 01:04:46 +02:00
sp_cache.h
mysql-5.1.73 merge
2014-03-15 18:24:15 +01:00
sp_head.cc
MDEV-6601 Assertion `!thd->in_active_multi_stmt_transa ction() || thd->in_multi_stmt_transaction_mode()' failed on executing a stored procedure with commit
2014-08-25 16:58:19 +02:00
sp_head.h
5.1 merge
2014-03-16 13:59:44 +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
5.1 merge
2014-03-16 13:59:44 +01:00
sp.cc
Merging revision 3839..3932 from codership-mysql/5.5.
2014-01-09 14:54:57 -05:00
sp.h
Merge with MariaDB 5.1
2011-11-24 18:48:58 +02:00
spatial.cc
5.3 merge
2014-11-18 17:36:51 +01:00
spatial.h
5.2 merge
2014-03-16 21:03:01 +01:00
sql_acl.cc
bzr merge -rtag:mariadb-5.5.40 maria/5.5
2014-10-09 17:25:08 -04:00
sql_acl.h
Merge with MariaDB 5.1
2011-11-24 18:48:58 +02:00
sql_admin.cc
bzr merge -rtag:mariadb-5.5.38 maria/5.5
2014-06-10 16:04:26 -04:00
sql_admin.h
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
sql_alter.cc
MDEV#6148 main.flush_read_lock fails due to conflicting
2014-04-21 21:45:19 -04:00
sql_alter.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_analyse.cc
mysql-5.1.73 merge
2014-03-15 18:24:15 +01:00
sql_analyse.h
5.1 merge
2014-03-16 13:59:44 +01:00
sql_array.h
5.2 merge
2014-03-16 21:03:01 +01:00
sql_audit.cc
Applying the patch to remove WL#7219 which was by mistake included by the dev team.
2014-09-05 08:37:21 +02:00
sql_audit.h
MDEV-5436 mysqld crash signal 11 in mysql_audit_general.
2014-02-28 00:23:20 +04:00
sql_base.cc
Merge revisions from maria/5.5
2014-12-16 20:07:34 -05:00
sql_base.h
mysql-5.5.34 merge
2013-11-19 13:16:25 +01:00
sql_binlog.cc
MySQL-5.5.36 merge
2014-02-17 11:00:51 +01:00
sql_binlog.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_bitmap.h
5.2 merge
2014-03-16 21:03:01 +01: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
MDEV-6781: bug with query cache when using views
2014-10-07 19:38:45 +02: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
MDEV-6924 : Server crashed on CREATE TABLE ... SELECT
2014-11-17 09:55:53 -05:00
sql_class.h
Merged r4014 from codership/5.5
2014-08-12 18:23:53 -04:00
sql_client.cc
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_connect.cc
Merge from maria/5.5 (-rtag:mariadb-5.5.36).
2014-02-25 17:49:41 -05: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
Fixed bug mdev-5028.
2013-10-02 17:59:56 -07:00
sql_cursor.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_db.cc
5.2 merge
2014-03-16 21:03:01 +01:00
sql_db.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_delete.cc
Local merge of mariadb-5.5.39
2014-08-06 14:06:11 -04:00
sql_delete.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_derived.cc
MDEV-6441: memory leak
2014-07-31 10:11:10 +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
Merge 5.3->5.5
2014-06-04 21:53:15 +04: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.34 merge
2013-11-19 13:16:25 +01:00
sql_handler.h
merge with 5.3
2011-10-19 21:45:18 +02:00
sql_help.cc
MySQL-5.5.36 merge
2014-02-17 11:00:51 +01: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
Local merge of mariadb-5.5.39
2014-08-06 14:06:11 -04:00
sql_insert.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_join_cache.cc
5.3 merge
2014-09-12 16:51:41 +02:00
sql_join_cache.h
5.3 merge
2012-02-21 20:51:56 +01:00
sql_lex.cc
Local merge of mariadb-5.5.39
2014-08-06 14:06:11 -04:00
sql_lex.h
MDEV-6179: dynamic columns functions/cast()/convert() doesn't play nice with CREATE/ALTER TABLE
2014-11-08 19:54:42 +01:00
sql_lifo_buffer.h
5.3 merge
2014-02-22 22:51:20 +01:00
sql_list.cc
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_list.h
Debugging aid: Add T* List<T>::elem(int n) which returns N-th element in the list.
2014-03-11 19:07:02 +01:00
sql_load.cc
MDEV-3940 Server crash or assertion `item->type() == Item::STRING_ITEM' failure on LOAD DATA through a view with statement binary logging
2014-11-18 15:42:32 +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
MySQL-5.5.36 merge
2014-02-17 11:00:51 +01:00
sql_manager.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_parse.cc
Merge revisions from maria/5.5
2014-12-16 20:07:34 -05:00
sql_parse.h
Merge with MariaDB 5.5.34.
2013-11-25 17:14:08 +02:00
sql_partition_admin.cc
* Merged revisions 3945, 3946..3950, 3951..3961
2014-02-28 13:56:08 -05:00
sql_partition_admin.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_partition.cc
mysql-5.5.39 merge
2014-08-02 21:26:16 +02:00
sql_partition.h
mysql-5.5.31 merge
2013-05-07 13:05:09 +02:00
sql_plist.h
MDEV-5205 - MariaDB does not start if more than 128 cpu's are available
2013-11-05 09:18:59 +04: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_plugin.cc
Local merge of mariadb-5.5.39
2014-08-06 14:06:11 -04:00
sql_plugin.h
Bug#18903155: BACKPORT BUG-18008907 TO 5.5+ VERSIONS.
2014-06-27 17:04:08 +05:30
sql_prepare.cc
5.2 merge
2014-03-16 21:03:01 +01:00
sql_prepare.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_priv.h
mysql-5.5.40
2014-10-06 19:53:55 +02:00
sql_profile.cc
5.3 merge
2013-01-15 19:07:46 +01:00
sql_profile.h
mysql-5.1.73 merge
2014-03-15 18:24:15 +01:00
sql_reload.cc
references lp:1011983
2012-06-12 16:34:18 +03:00
sql_reload.h
…
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
Local merge of mariadb-5.5.39
2014-08-06 14:06:11 -04:00
sql_repl.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_select.cc
Merge
2014-10-29 14:22:25 +03:00
sql_select.h
MDEV-6289 : Unexpected results when querying information_schema
2014-07-23 19:53:29 +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
bzr merge -rtag:mariadb-5.5.40 maria/5.5
2014-10-09 17:25:08 -04:00
sql_show.h
Bug#17638477 UNINSTALL AND INSTALL SEMI-SYNC PLUGIN CAUSES SLAVES TO BREAK
2014-05-05 22:22:15 +05:30
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
5.2 merge
2014-03-16 21:03:01 +01:00
sql_state.c
mysql-5.5.37 selective merge
2014-03-27 22:26:58 +01:00
sql_string.cc
mysql-5.5.38 merge
2014-06-03 09:55:08 +02:00
sql_string.h
MDEV-7019 String::chop() is wrong and may potentially crash (MySQL bug#56492)
2014-11-10 18:08:17 +04:00
sql_table.cc
Merge revisions from maria/5.5
2014-12-16 20:07:34 -05:00
sql_table.h
mysql-5.5.39 merge
2014-08-02 21:26:16 +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
Debugging aid: Add T* List<T>::elem(int n) which returns N-th element in the list.
2014-03-11 19:07:02 +01:00
sql_test.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_time.cc
Merge 5.3->5.5
2014-06-05 09:15:25 +04:00
sql_time.h
Merge 5.3->5.5
2014-06-04 21:53:15 +04:00
sql_trigger.cc
Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.
2014-04-16 12:13:43 +03:00
sql_trigger.h
5.3 merge
2012-01-13 15:50:02 +01:00
sql_truncate.cc
bzr merge -rtag:mariadb-5.5.38 maria/5.5
2014-06-10 16:04:26 -04:00
sql_truncate.h
Bug#17942050:KILL OF TRUNCATE TABLE WILL LEAD TO BINARY LOG
2014-04-15 15:17:25 +05:30
sql_udf.cc
MDEV-5616 - Deadlock between CREATE/DROP FUNCTION and SELECT from view
2014-02-13 16:41:08 +04:00
sql_udf.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
sql_union.cc
MDEV-6868: MariaDB server crash ( select with union and order by with subquery )
2014-11-15 22:18:33 +01:00
sql_union.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_update.cc
bzr merge -rtag:mariadb-5.5.38 maria/5.5
2014-06-10 16:04:26 -04:00
sql_update.h
mysql-5.5.18 merge
2011-11-03 19:17:05 +01:00
sql_view.cc
mysql-5.5.39 merge
2014-08-02 21:26:16 +02:00
sql_view.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sql_yacc.yy
Merge revisions from maria/5.5
2014-12-16 20:07:34 -05:00
strfunc.cc
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
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_shared.h
Updated/added copyright headers
2011-06-30 17:46:53 +02:00
sys_vars.cc
MDEV-6924 : Server crashed on CREATE TABLE ... SELECT
2014-11-17 09:55:53 -05:00
sys_vars.h
mysql-5.5.33 merge
2013-09-06 22:31:30 +02:00
table.cc
Merge revisions from maria/5.5
2014-12-16 20:07:34 -05:00
table.h
5.3 merge
2014-09-12 16:51:41 +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_common.cc
MDEV-5205 - MariaDB does not start if more than 128 cpu's are available
2013-11-05 09:18:59 +04:00
threadpool_unix.cc
MDEV-5205 - MariaDB does not start if more than 128 cpu's are available
2013-11-06 22:53:39 +04:00
threadpool_win.cc
MDEV-531 : Warning: Forcing close of thread ... in rpl_binlog_index
2012-11-02 10:43:52 +01:00
threadpool.h
MDEV-5205 - MariaDB does not start if more than 128 cpu's are available
2013-11-05 09:18:59 +04:00
transaction.cc
Merged r4014 from codership/5.5
2014-08-12 18:23:53 -04:00
transaction.h
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
tzfile.h
Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 13:29:12 +01:00
tztime.cc
5.2 merge
2014-03-16 21:03:01 +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
…
uniques.cc
Merge 5.3->5.5
2013-01-23 15:18:05 -08:00
unireg.cc
Fixed a compiler failure and removed some warnings in windows
2014-03-11 16:53:24 +02: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_applier.cc
bzr merge -r4015..4026 codership/5.5
2014-10-09 18:28:14 -04:00
wsrep_applier.h
Merging revision 3839..3932 from codership-mysql/5.5.
2014-01-09 14:54:57 -05:00
wsrep_binlog.cc
Merge lp:codership-mysql/5.5 -r3961..3980.
2014-04-16 13:08:29 +03:00
wsrep_binlog.h
Merge lp:codership-mysql/5.5 -r3961..3980.
2014-04-16 13:08:29 +03:00
wsrep_check_opts.cc
MDEV-6447: Galera: Enable QC
2014-09-17 14:12:00 -04:00
wsrep_hton.cc
Merge lp:codership-mysql/5.5 -r3961..3980.
2014-04-16 13:08:29 +03:00
wsrep_mysqld.cc
bzr merge -r4015..4026 codership/5.5
2014-10-09 18:28:14 -04:00
wsrep_mysqld.h
bzr merge -r4015..4026 codership/5.5
2014-10-09 18:28:14 -04:00
wsrep_notify.cc
Merge lp:codership-mysql/5.5 -r3961..3980.
2014-04-16 13:08:29 +03:00
wsrep_priv.h
Merging revision 3839..3932 from codership-mysql/5.5.
2014-01-09 14:54:57 -05:00
wsrep_sst.cc
bzr merge -rtag:mariadb-5.5.40 maria/5.5
2014-10-09 17:25:08 -04:00
wsrep_sst.h
MDEV-4647: Crash on setting wsep system variables to default
2014-07-22 09:27:35 -04:00
wsrep_thd.cc
bzr merge -r3997..4010 codership-mysql/5.5
2014-08-06 15:45:53 -04:00
wsrep_thd.h
bzr merge -r3997..4010 codership-mysql/5.5
2014-08-06 15:45:53 -04:00
wsrep_utils.cc
MDEV-6636 : Merged fixes for lp:1167368 and lp:1250805.
2014-08-25 17:03:17 -04:00
wsrep_utils.h
Merging revision 3839..3932 from codership-mysql/5.5.
2014-01-09 14:54:57 -05:00
wsrep_var.cc
bzr merge -r4015..4026 codership/5.5
2014-10-09 18:28:14 -04:00
wsrep_var.h
Merged r4014 from codership/5.5
2014-08-12 18:23:53 -04:00