mariadb/sql
Nirbhay Choubey 8e476e6cbe MDEV#5534: mysql_tzinfo_to_sql generates wrong query
mysql_tzinfo_to_sql tries to set wsrep_replicate_myisam
as SESSION variable, while its a GLOBAL-only system variable,
and thus the resulting sql would fail to load.

Fixed by changing the scope to GLOBAL in the SET command.

Also added following include files to facilitate testing :
* include/have_wsrep.inc
* include/not_wsrep.inc
* include/have_wsrep_enabled.inc
2014-02-14 11:38:46 -05:00
..
examples merge with 5.3 2011-10-19 21:45:18 +02:00
share Fix for MDEV-5547: Bad error message when moving very old .frm files to MariaDB 5.5. 2014-01-22 15:16:57 +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 Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05: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 MDEV-4824 userstats - wrong user statistics 2013-11-11 16:17:32 +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 mysql-5.5.34 merge 2013-11-19 13:16:25 +01:00
event_scheduler.h Bug#16865959 - PLEASE BACKPORT BUG 14749800. 2013-07-24 15:44:41 +05:30
events.cc Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
events.h mysql-5.5.34 merge 2013-11-19 13:16:25 +01:00
field.cc make 5.1 compiling with modern gcc. 2013-12-20 12:35:47 +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 remerge 5.1 => 5.5 2013-10-29 19:55:38 +01: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 mysql-5.5.34 merge 2013-11-19 13:16:25 +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 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
ha_partition.h Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05:00
handler.cc MDEV#5534: mysql_tzinfo_to_sql generates wrong query 2014-02-14 11:38:46 -05:00
handler.h Merge with MariaDB 5.5.34. 2013-11-25 17:14:08 +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 Fix for MDEV-5531: double call procedure in one session - hard shutdown the server 2014-01-24 14:50:18 +02:00
item.h Fixed that setup_natural_join_row_types can safely be called twice 2014-01-26 21:48:23 +01:00
item_buff.cc 5.3 merge 2012-01-13 15:50:02 +01:00
item_cmpfunc.cc Merge 2013-11-22 18:38:13 -08:00
item_cmpfunc.h Merge 5.3->5.5 2013-11-21 21:40:43 -08: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 Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05:00
item_func.h 5.3 merge 2013-12-13 13:00:38 +01:00
item_geofunc.cc merge 5.3 -> 5.5 2013-09-25 17:16:13 +03:00
item_geofunc.h merge 5.3 -> 5.5 2013-09-25 17:16:13 +03:00
item_row.cc merge 5.3 -> 5.5 2013-09-25 17:16:13 +03:00
item_row.h 5.3 merge 2012-01-13 15:50:02 +01:00
item_strfunc.cc merge 5.3 -> 5.5 2014-01-28 13:00:50 +04:00
item_strfunc.h merge 5.3 -> 5.5 2014-01-28 13:00:50 +04:00
item_subselect.cc MDEV-5153: Server crashes in Item_ref::fix_fields on 2nd execution of PS with LEFT JOIN and MERGE view or SELECT SQ 2013-11-11 17:28:14 +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.35 merge 2014-01-22 15:29:36 +01:00
item_sum.h mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
item_timefunc.cc MDEV-5458 RQG hits 'sql/tztime.cc:799: my_time_t sec_since_epoch(...): 2014-01-27 13:15:40 +04:00
item_timefunc.h MDEV-5504 Server crashes in String::length on SELECT with MONTHNAME, GROUP BY, ROLLUP 2014-01-24 16:50:39 +04:00
item_xmlfunc.cc merge 5.3 -> 5.5 2013-09-25 17:16:13 +03:00
item_xmlfunc.h merge 5.3 -> 5.5 2013-09-25 17:16:13 +03: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 Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
log.h Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
log_event.cc Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05:00
log_event.h mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
log_event_old.cc mysql-5.5.34 merge 2013-11-19 13:16:25 +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 * 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 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 MDEV-5037: Server crash on a JOIN on a derived table with join_cache_level > 2 2013-09-20 14:47:38 +04:00
multi_range_read.h MDEV-5037: Server crash on a JOIN on a derived table with join_cache_level > 2 2013-09-20 14:47:38 +04: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 Merging revisions 3934..3944 from codership-mysql/5.5. 2014-02-03 22:55:46 -05:00
mysqld.h Merging revisions 3934..3944 from codership-mysql/5.5. 2014-02-03 22:55:46 -05: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.35 merge 2014-01-22 15:29:36 +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 MySQL-5.5.35 merge 2014-01-22 15:29:36 +01: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 MDEV-5368: Server crashes in Item_in_subselect::optimize on ... 2014-01-23 21:26:04 +04:00
opt_subselect.h MDEV-5037: Server crash on a JOIN on a derived table with join_cache_level > 2 2013-09-20 14:47:38 +04: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.5.31 merge 2013-05-07 13:05:09 +02: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 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
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 Fix for MDEV-5531: double call procedure in one session - hard shutdown the server 2014-01-24 14:50: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 mysql-5.5.34 merge 2013-11-19 13:16:25 +01: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 mysql-5.5.34 merge 2013-11-19 13:16:25 +01: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 MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c 2014-01-28 12:25:29 +04:00
set_var.h Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05: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 of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05:00
slave.h Merge MWL#234: @@skip_replication feature to MariaDB 5.5. 2012-03-01 12:41:49 +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
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.34 merge 2013-11-19 13:16:25 +01: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 MDEV-4788 check mysql-5.5 changes in spatial.cc. 2013-10-10 14:20:35 +05:00
spatial.h Merge 5.3->5.5. 2013-08-18 19:58:51 -07:00
sql_acl.cc Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETE 2013-10-16 14:16:32 +05:30
sql_acl.h Merge with MariaDB 5.1 2011-11-24 18:48:58 +02:00
sql_admin.cc Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05: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 * Merged the missing revision 3934 from 2014-02-05 00:28:11 -05:00
sql_base.h mysql-5.5.34 merge 2013-11-19 13:16:25 +01: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 mysql-5.5.34 merge 2013-11-19 13:16:25 +01: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 Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05:00
sql_class.h Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05:00
sql_client.cc Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_connect.cc Reverting the change erroneously got introduced during merge. 2014-02-10 23:54:18 -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 mysql-5.5.34 merge 2013-11-19 13:16:25 +01: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 merge 5.3->5.5 2014-01-26 16:41:15 +02: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.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.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 of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05: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 Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05:00
sql_lex.h Merge 5.3->5.5 2014-01-15 16:07:50 +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 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 Bug#17429677:LAST ARGUMENT OF LOAD DATA ...SET ...STATEMENT 2013-10-16 11:49:00 +05:30
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.34 merge 2013-11-19 13:16:25 +01:00
sql_manager.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_parse.cc * Merged the missing revision 3934 from 2014-02-05 00:28:11 -05:00
sql_parse.h Merge with MariaDB 5.5.34. 2013-11-25 17:14:08 +02:00
sql_partition.cc MySQL-5.5.35 merge 2014-01-22 15:29:36 +01: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 MDEV-5205 - MariaDB does not start if more than 128 cpu's are available 2013-11-05 09:18:59 +04:00
sql_plugin.cc Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05: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 Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05: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 Bug#17402313 DUMP THREAD SENDS SOME EVENTS MORE THAN ONCE 2013-09-10 09:35:49 +08:00
sql_repl.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
sql_select.cc MDEV-5461 Assertion `length <= column->length' fails in write_block_record with functions in select list, GROUP BY, ORDER BY 2014-01-26 21:49:19 +01:00
sql_select.h Merge 5.3->5.5 2013-10-29 18:50:36 +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. 2013-02-25 15:26:00 +01:00
sql_show.cc Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05: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 Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05: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 Merge 5.3 -> 5.5 2014-01-27 15:05:23 +04:00
sql_time.h Merge 5.3 -> 5.5 2014-01-27 15:05:23 +04:00
sql_trigger.cc Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05: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 Merge 5.3->5.5 2014-01-15 16:07:50 +02: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 merge 5.3->5.5 2014-01-26 16:41:15 +02:00
sql_view.h Updated/added copyright headers 2011-06-30 17:46:53 +02:00
sql_yacc.yy Merge 5.3->5.5 2014-01-15 16:07:50 +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 Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05: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 Merge of maria/5.5 into maria-5.5-galera. 2014-01-29 19:00:43 -05:00
table.h merge 5.3 -> 5.5 2013-09-25 17:16:13 +03: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 MDEV-5205 - MariaDB does not start if more than 128 cpu's are available 2013-11-05 09:18:59 +04: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
transaction.cc Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
transaction.h Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEAR 2013-08-20 13:12:34 +04:00
tzfile.h Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
tztime.cc MDEV#5534: mysql_tzinfo_to_sql generates wrong query 2014-02-14 11:38:46 -05: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_applier.cc Fixes for some compiler warnings. 2014-01-09 23:22:10 -05:00
wsrep_applier.h Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
wsrep_binlog.cc Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
wsrep_binlog.h Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05: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 Merging revisions 3934..3944 from codership-mysql/5.5. 2014-02-03 22:55:46 -05:00
wsrep_mysqld.cc * Merged the missing revision 3934 from 2014-02-05 00:28:11 -05:00
wsrep_mysqld.h Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
wsrep_notify.cc Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
wsrep_priv.h Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
wsrep_sst.cc Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
wsrep_sst.h Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
wsrep_thd.cc * Merged the missing revision 3934 from 2014-02-05 00:28:11 -05:00
wsrep_thd.h * Merged the missing revision 3934 from 2014-02-05 00:28:11 -05:00
wsrep_utils.cc Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
wsrep_utils.h Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00
wsrep_var.cc Merging revisions 3934..3944 from codership-mysql/5.5. 2014-02-03 22:55:46 -05:00
wsrep_var.h Merging revision 3839..3932 from codership-mysql/5.5. 2014-01-09 14:54:57 -05:00