Michael Widenius bd2117d154 Automatic merge from 5.5 ...

Fixed 2 failing tests by replacing result files

2014-08-19 21:35:14 +03:00

..

atomic

MDEV-5766 - my_atomic_load does memory writes

2014-03-07 11:43:06 +04:00

mysql

Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS,

2014-05-08 18:13:01 +05:30

base64.h

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

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

big_endian.h

…

byte_order_generic_x86_64.h

…

byte_order_generic_x86.h

…

byte_order_generic.h

…

CMakeLists.txt

merge 10-base->10.0

2013-11-11 23:40:53 +02:00

decimal.h

5.2 merge

2014-03-16 21:03:01 +01: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

…

hash.h

MDEV-5675 - Performance: my_hash_sort_bin is called too often

2014-03-06 16:19:12 +04: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

…

little_endian.h

…

m_ctype.h

5.2 merge

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

m_string.h

5.2 merge

2014-03-16 21:03:01 +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-5314 - Compiling fails on OSX using clang

2014-02-19 14:05:15 +04:00

my_aes.h

…

my_alarm.h

…

my_alloc.h

mysql-5.1.73 merge

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

my_atomic.h

…

my_attribute.h

5.1 merge

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

my_base.h

merge of "BUG#18233051 - FTS: FAILING ASSERTION: NUM_TOKEN < MAX_PROXIMITY_ITEM"

2014-05-07 22:36:40 +02:00

my_bit.h

…

my_bitmap.h

Fixes to get valgrind to work with jemalloc

2014-01-02 11:19:19 +02:00

my_byteorder.h

…

my_check_opt.h

5.5 merge

2014-02-01 00:54:03 +01:00

my_compare.h

5.2 merge

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

my_compiler.h

mysql-5.1.73 merge

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

my_context.h

10.0-base merge

2013-07-18 16:46:57 +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_dbug.h

…

my_decimal_limits.h

…

my_default.h

…

my_dir.h

5.2 merge

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

my_getopt.h

10.0-base merge

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

my_global.h

Merge 5.3->5.5

2014-06-04 21:53:15 +04:00

my_handler_errors.h

merge of "BUG#18233051 - FTS: FAILING ASSERTION: NUM_TOKEN < MAX_PROXIMITY_ITEM"

2014-05-07 22:36:40 +02:00

my_libwrap.h

…

my_list.h

…

my_md5.h

10.0-monty merge

2013-07-21 16:39:19 +02:00

my_net.h

10.0-base merge

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

my_nosys.h

…

my_pthread.h

5.2 merge

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

my_rdtsc.h

…

my_rnd.h

…

my_stacktrace.h

…

my_sys.h

MDEV-6274 Collation usage statistics

2014-08-11 05:45:45 +04:00

my_time.h

5.5.38 merge

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

my_tree.h

5.2 merge

2014-03-16 21:03:01 +01: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

10.0-base merge

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

myisamchk.h

5.5 merge

2014-02-01 00:54:03 +01:00

myisammrg.h

…

myisampack.h

mysql-5.1.73 merge

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

mysql_async.h

…

mysql_com_server.h

…

mysql_com.h

Fixed assert in perfschema/pfs.cc::start_idle_wait_v1 when using performance schema and big packets in debug version.

2014-07-19 13:38:40 +03:00

mysql_embed.h

…

mysql_time.h

10.0-base merge

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

mysql_version.h.in

mysql-5.5.37 selective merge

2014-03-27 22:26:58 +01:00

mysql.h

Client attributes

2013-10-03 18:00:44 +03:00

mysql.h.pp

Fixed assert in perfschema/pfs.cc::start_idle_wait_v1 when using performance schema and big packets in debug version.

2014-07-19 13:38:40 +03:00

mysqld_default_groups.h

…

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

MDEV-4243 [PATCH] Warnings/errors while compiling with clang

2013-11-28 22:35:59 +01:00

probes_mysql.d.base

…

probes_mysql.h

…

queues.h

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

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

rijndael.h

…

service_versions.h

MroongaSE: addint thd_autoinc and thd_error_context plugin services

2013-12-12 19:18:49 +04: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

…

sslopt-longopts.h

…

sslopt-vars.h

…

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

…

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

mysql-5.1.73 merge

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

waiting_threads.h

…

welcome_copyright_notice.h

mysql-5.1.73 merge

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

wqueue.h

…