Marko Mäkelä ad0c218a44 Merge 10.0 into 10.1 ...

Also, implement MDEV-11027 a little differently from 5.5 and 10.0:

recv_apply_hashed_log_recs(): Change the return type back to void
(DB_SUCCESS was always returned).

Report progress also via systemd using sd_notifyf().

2017-03-09 08:53:08 +02:00

..

atomic

Merge tag 'mariadb-10.0.20' into 10.1

2015-06-27 20:35:26 +02:00

mysql

Merge 10.0 into 10.1

2017-03-09 08:53:08 +02:00

base64.h

Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6

2013-09-23 18:58:33 +04:00

big_endian.h

Temporary commit of 10.0-merge

2013-03-26 00:03:13 +02:00

byte_order_generic_x86_64.h

MDEV-10951 Field_newdate::cmp access violation

2016-10-25 22:35:35 +00:00

byte_order_generic_x86.h

MDEV-10951 Field_newdate::cmp access violation

2016-10-25 22:35:35 +00:00

byte_order_generic.h

Temporary commit of 10.0-merge

2013-03-26 00:03:13 +02:00

CMakeLists.txt

Merge branch '5.5' into bb-10.0

2016-06-21 14:11:02 +02:00

decimal.h

remove unneded #include's that had a dubious explanation

2015-10-24 19:58:34 +02:00

errmsg.h

5.5.38 merge

2014-06-06 00:07:27 +02:00

ft_global.h

mysql-5.1.73 merge

2014-03-15 18:24:15 +01:00

handler_ername.h

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

handler_state.h

Fix for MDEV-533: Confusing error code when doing auto-increment insert for out-of-range values

2012-09-18 15:14:19 +03:00

hash.h

MDEV-9024 Build fails with VS2015

2015-11-06 17:27:24 +01:00

heap.h

5.5 merge

2014-03-26 22:25:38 +01:00

keycache.h

Fixed problem with very slow shutdown when using 100,000 MyISAM tables with delay_key_write

2014-07-19 17:46:08 +03:00

lf.h

MDEV-7728 - Improve xid cache scalability by using lock-free hash

2015-03-16 19:07:51 +04:00

little_endian.h

Temporary commit of 10.0-merge

2013-03-26 00:03:13 +02:00

m_ctype.h

Merge branch '10.0' into 10.1

2016-12-11 09:53:42 +01:00

m_string.h

Merge branch '10.0' into bb-10.1-merge

2014-12-02 22:25:16 +01:00

ma_dyncol.h

MDEV-5404 Can't free data returned by mariadb_dyncol_unpack on windows

2014-03-19 09:58:18 +01:00

maria.h

MDEV-10759 Fix Aria to support 2-byte collation IDs

2016-12-02 14:05:16 +02:00

my_alarm.h

MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()

2015-09-06 22:26:33 +02:00

my_alloc.h

mysql-5.1.73 merge

2014-03-15 18:24:15 +01:00

my_atomic.h

MDEV-7437 remove suport for "atomics" with rwlocks

2015-01-13 10:15:21 +01:00

my_attribute.h

5.1 merge

2014-03-16 13:59:44 +01:00

my_base.h

Revert "Add extra HA_ERR message that Percona introduced within TokuDB 5.6.35-80"

2017-03-06 19:17:15 +02:00

my_bit.h

cleanup

2016-02-23 10:46:16 +01:00

my_bitmap.h

jemalloc compatibility

2014-10-08 00:45:41 +02:00

my_byteorder.h

Temporary commit of 10.0-merge

2013-03-26 00:03:13 +02:00

my_check_opt.h

5.5 merge

2015-01-21 12:03:02 +01:00

my_compare.h

MDEV-10759 Fix Aria to support 2-byte collation IDs

2016-12-02 14:05:16 +02:00

my_compiler.h

mysql-5.1.73 merge

2014-03-15 18:24:15 +01:00

my_context.h

Fix spelling: occurred, execute, which etc

2016-03-04 02:09:37 +02:00

my_cpu.h

MDEV-6450 - MariaDB crash on Power8 when built with advance tool chain

2014-08-19 19:28:35 +03:00

my_crypt.h

New encryption API. Piece-wise encryption.

2015-09-04 10:33:50 +02:00

my_dbug.h

dbug: correct trace for DBUG_RETURN(func()); -- gcc only

2015-11-16 07:55:55 +01:00

my_decimal_limits.h

…

my_default.h

Temporary commit of 10.0-merge

2013-03-26 00:03:13 +02:00

my_dir.h

5.2 merge

2014-03-16 21:03:01 +01:00

my_getopt.h

MDEV-6066: Merge new defaults from 5.6 and 5.7

2015-09-04 10:33:56 +02:00

my_global.h

Merge 10.0 into 10.1

2017-03-03 13:27:12 +02:00

my_handler_errors.h

Revert "Add extra HA_ERR message that Percona introduced within TokuDB 5.6.35-80"

2017-03-06 19:17:15 +02:00

my_libwrap.h

Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER

2013-03-19 13:29:12 +01:00

my_list.h

Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER

2013-03-19 13:29:12 +01:00

my_md5.h

encryption cleanup: small changes

2015-04-05 13:14:37 +02:00

my_net.h

Fixes needed to compile with musl C library

2016-02-07 15:00:30 +02:00

my_nosys.h

Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER

2013-03-19 13:29:12 +01:00

my_pthread.h

MDEV-9024 Build fails with VS2015

2016-02-06 22:41:58 +01:00

my_rdtsc.h

MDEV-9172 - Analyze patches for IBM System z

2015-12-09 16:52:12 +04:00

my_rnd.h

Temporary commit of 10.0-merge

2013-03-26 00:03:13 +02:00

my_stacktrace.h

[MDEV-9127] Crash reporter often fails to show the query that crashed

2016-07-12 11:58:20 +03:00

my_sys.h

Merge 10.0 into 10.1

2017-03-09 08:53:08 +02:00

my_systemd.h

MDEV-427/MDEV-5713 Add systemd script with notify functionality

2015-10-12 17:51:49 +02:00

my_time.h

5.5.38 merge

2014-06-06 00:07:27 +02:00

my_tree.h

Merge branch '5.5' into bb-10.0

2016-06-21 14:11:02 +02:00

my_uctype.h

…

my_user.h

support DEFINER=role and DEFINER=current_role

2013-10-18 12:17:49 -07:00

my_valgrind.h

10.0-base merge

2014-02-26 15:28:07 +01:00

my_xml.h

MDEV-4928 Merge collation customization improvements

2013-10-02 15:04:07 +04:00

myisam.h

Merge branch '5.5' into bb-10.0

2016-06-21 14:11:02 +02:00

myisamchk.h

Merge branch '5.5' into 10.0

2015-05-04 22:00:24 +02:00

myisammrg.h

fix merge.test: online alter table support for MERGE tables, really

2013-07-11 18:57:11 +02:00

myisampack.h

mysql-5.1.73 merge

2014-03-15 18:24:15 +01:00

mysql_async.h

MDEV-3802: Millisecond timeout support in non-blocking client library + fix incorrect blocking.

2012-10-12 11:00:01 +02:00

mysql_com_server.h

Next part of merge. See TODO for details

2012-08-14 17:23:34 +03:00

mysql_com.h

Merge branch '10.0' into 10.1

2016-08-25 12:40:09 +02:00

mysql_embed.h

…

mysql_time.h

10.0-base merge

2013-07-18 16:46:57 +02:00

mysql_version.h.in

MDEV-7067: Server outputs Galera (WSREP) information, even if Galera is disabled

2015-05-29 11:26:46 -04:00

mysql.h

MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()

2015-09-06 22:26:33 +02:00

mysql.h.pp

Merge branch '10.0' into 10.1

2016-08-25 12:40:09 +02:00

mysqld_default_groups.h

MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)

2014-10-11 18:53:06 +02:00

mysys_err.h

…

password.h

Do the partial merge of WL#5602 correctly:

2013-12-09 12:38:02 +01:00

probes_mysql_nodtrace.h.in

Merge branch '5.5' into 10.0

2016-02-15 22:50:59 +01:00

probes_mysql.d.base

…

probes_mysql.h

more portable fix for lp:942266 - 5.5 builds fail with systemtap-sdt-dev installed on Ubuntu

2012-05-11 09:18:00 +02:00

queues.h

MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.

2014-02-07 19:15:28 +01:00

rijndael.h

Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER

2013-03-19 13:29:12 +01:00

service_versions.h

Merge branch 'github/10.0-galera' into 10.1

2015-12-22 10:32:33 +01:00

sha1.h

SHA1 service

2013-07-13 17:48:06 +02:00

sha2.h

…

sql_common.h

5.2 merge

2014-03-16 21:03:01 +01:00

sslopt-case.h

WL#9072: Backport WL#8785 to 5.5

2016-02-19 23:31:10 +04:00

sslopt-longopts.h

WL#9072: Backport WL#8785 to 5.5

2016-02-19 23:31:10 +04:00

sslopt-vars.h

WL#9072: Backport WL#8785 to 5.5

2016-02-19 23:31:10 +04:00

t_ctype.h

Updated/added copyright header. Added line "use is subject to license terms"

2014-02-17 18:19:04 +05:30

thr_alarm.h

5.2 merge

2014-03-16 21:03:01 +01:00

thr_lock.h

my_b_fill, inline my_b_* functions instead of hairy macros

2015-06-02 18:53:37 +02:00

thr_timer.h

followup changes to timeout commit

2014-10-10 22:27:36 +02:00

thread_pool_priv.h

5.5.39 merge

2014-08-07 18:06:56 +02:00

typelib.h

mysql-5.1.73 merge

2014-03-15 18:24:15 +01:00

violite.h

MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows.

2016-06-08 17:13:49 +00:00

waiting_threads.h

…

welcome_copyright_notice.h

Merge branch 'mysql/5.5' into 5.5

2016-02-09 11:27:40 +01:00

wqueue.h

…

wsrep.h

Merge branch '10.0-galera' into bb-10.1-serg

2016-02-24 01:21:40 -05:00