Sergey Vojtovich 4179b9a53e Merge.

2013-06-10 15:07:55 +04:00

..

archive

portability fixes for mysql-test

2013-04-10 15:43:57 +02:00

binlog

5.5 merge

2013-06-06 17:51:28 +02:00

csv

error messages: name the storage engine explicitly,

2013-04-09 23:27:07 +02:00

engines

5.5 merge

2013-03-27 23:41:02 +01:00

federated

5.5 merge

2013-06-06 17:51:28 +02:00

funcs_1

Forgotten .result file update.

2013-06-08 12:36:21 +02:00

funcs_2

…

handler

5.5 merge

2013-06-06 17:51:28 +02:00

heap

5.5 merge

2013-03-27 23:41:02 +01:00

innodb

5.5 merge

2013-06-06 17:51:28 +02:00

jp

find_files(): don't sort files in my_dir(), sort table names

2013-04-07 17:17:25 +02:00

large_tests

…

manual

…

maria

5.5 merge

2013-06-06 17:51:28 +02:00

mtr/t

…

mtr2

…

multi_source

MDEV-4475: Replication from MariaDB 10.0 to 5.5 does not work

2013-05-24 22:21:08 +02:00

optimizer_unfixed_bugs

…

oqgraph

…

parts

- Solaris fixes:

2013-05-15 16:28:12 +03:00

percona

error messages: name the storage engine explicitly,

2013-04-09 23:27:07 +02:00

perfschema

MDEV-4478: Implement GTID "strict mode"

2013-05-28 13:28:31 +02:00

perfschema_stress

…

plugins

Merge.

2013-06-07 12:10:45 +04:00

rpl

MDEV-4490: Old-style master position points at the last GTID event after slave restart

2013-06-07 14:39:00 +02:00

sphinx

Don't show sphinx_error% as this may be a different set of variables in different SPHINX releases

2013-03-17 14:33:17 +02:00

storage_engine

Add missing check for thd->killed in mysql_binlog_send().

2013-04-24 13:05:40 +02:00

stress

…

sys_vars

5.5 merge

2013-06-06 17:51:28 +02:00

unit

…

vcol

5.5 merge

2013-01-29 15:10:47 +01:00