Vicențiu Ciorbaru
8e15768731
Merge branch '10.0' into 10.1
2017-01-16 03:18:14 +02:00
Vicențiu Ciorbaru
94e18e2987
Merge remote-tracking branch 'merge/merge-perfschema-5.6' into 10.0
2017-01-10 12:32:54 +02:00
Vicențiu Ciorbaru
c33db2cdc0
5.6.35
2017-01-07 15:53:37 +02:00
Sergei Golubchik
530a6e7481
Merge branch '10.0' into 10.1
...
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
2015-09-03 12:58:41 +02:00
Sergei Golubchik
0a99293db3
Merge branch 'merge-perfschema-5.6' into 10.0
...
5.6.26
2015-08-03 16:34:59 +02:00
Sergei Golubchik
167c540048
5.6.26
2015-08-03 13:05:40 +02:00
Sergei Golubchik
5091a4ba75
Merge tag 'mariadb-10.0.19' into 10.1
2015-06-01 15:51:25 +02:00
Sergei Golubchik
1d3ea9ecd8
perfschema 5.6.24
...
including the big commit
commit 305130361bf72726de220f3d2b2787395e10be61
Author: Marc Alff <marc.alff@oracle.com>
Date: Tue Feb 10 11:31:32 2015 +0100
WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6
(with the following commits) and related changes in sql/
2015-05-05 15:23:47 +02:00
Sergei Golubchik
d71d411905
5.6.24
2015-05-04 22:16:00 +02:00
Sergei Golubchik
4b21cd21fe
Merge branch '10.0' into merge-wip
2015-01-31 21:48:47 +01:00
Sergei Golubchik
b0a8e07357
P_S 5.6.22
2015-01-21 14:53:40 +01:00
Sergei Golubchik
05c002d0ff
5.6.22
2015-01-19 00:12:51 +01:00
Sergei Golubchik
227510e039
parser cleanup: don't store field properties in LEX, use Create_field directly
...
length/dec/charset are still in LEX, because they're also used
for CAST and dynamic columns.
also
1. fix "MDEV-7041 COLLATION(CAST('a' AS CHAR BINARY)) returns a wrong result"
2. allow BINARY modifier in stored function RETURN clause
3. allow "COLLATION without CHARSET" in SP/SF (parameters, RETURN, DECLARE)
4. print correct variable name in error messages for stored routine parameters
2014-12-04 16:09:34 +01:00
Sergei Golubchik
d6141a553c
MD5 service
2014-10-01 23:38:28 +02:00
Sergei Golubchik
59cea2e1bf
MDEV-6258 MariaDB 10.0 performance schema timestamps relative to epoch
...
don't use the interval timer when absolute time values are needed
2014-06-05 09:03:55 +02:00
Sergei Golubchik
edf1fbd25b
MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wrong executable bits
2014-05-13 11:53:30 +02:00
Sergei Golubchik
5ffe939a6c
perfschema 5.6.17
2014-05-07 16:12:16 +02:00
Sergei Golubchik
04bce7b569
5.6.17
2014-05-07 10:04:30 +02:00
Sergei Golubchik
d74414399d
perfschema 5.6.10 initial commit.
...
10.0 files
2014-05-06 23:20:50 +02:00
Michael Widenius
c46ce32cfb
Fixed memory leaks. alias.test now runs clean with valgrind
2013-06-20 14:49:25 +03:00
Michael Widenius
5f1f2fc0e4
Applied all changes from Igor and Sanja
2013-06-15 18:32:08 +03:00
Michael Widenius
068c61978e
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +02:00
Michael Widenius
1d0f70c2f8
Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6
2012-08-01 17:27:34 +03:00
