summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-0/+10
|\
| * Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-241-0/+10
| |\
| | * MDEV-12190 YASSL isn't able to negotiate TLS version correctlyVladislav Vaintroub2018-03-141-0/+10
| * | Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-196-16/+38
| |\ \ | | |/
| * | Merge tag 'mariadb-5.5.56' into 5.5-galeraSachin Setiya2017-05-031-1/+1
| |\ \
| * \ \ Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54Nirbhay Choubey2016-12-272-0/+80
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.5' into 5.5-galeraNirbhay Choubey2016-10-1411-122/+274
| |\ \ \ \
| * \ \ \ \ Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-232-4/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-259-32/+80
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-136-15/+40
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-1311-7/+93
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '5.5' into 5.5-galeraNirbhay Choubey2015-02-1811-20/+342
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge revisions from maria/5.5 (5.5.41)Nirbhay Choubey2014-12-224-4/+13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge revisions from maria/5.5Nirbhay Choubey2014-12-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-09138-46272/+703
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-064-10/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-1686-429/+868
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | MDEV#5812 Memory leaks while running mysqld inNirbhay Choubey2014-03-111-3/+8
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-038-26/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '5.5' into 10.0Sergei Golubchik2017-10-186-17/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2017-10-174-8/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Bug#26482173: TLS CIPHER NEGOTIATION INCORRECTLY MATCHES ONArun Kuruvila2017-08-247-164/+182
| | | * | | | | | | | | | | | | | | Bug #24740291: YASSL UPDATE TO 2.4.2Robert Golebiowski2016-09-2711-122/+274
| | * | | | | | | | | | | | | | | | MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-172-8/+14
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Build improvements and cleanups.Vladislav Vaintroub2017-09-082-9/+0
* | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-303-11/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-0/+1
| * | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-05-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | mysqld_safe_help - remove warningmariadb-5.5.56Daniel Black2017-04-301-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | MDEV-12488 Remove type mismatch in InnoDB printf-like callsMarko Mäkelä2017-04-211-10/+24
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Fixed compiler warningsMonty2017-02-281-1/+0
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-132-0/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-062-0/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Numerous issues in mysqld_safeSergei Golubchik2016-12-222-0/+80
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-2813-129/+327
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-2/+2
| * | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-10-2511-122/+274
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-10-1311-122/+274
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Bug #24740291: YASSL UPDATE TO 2.4.2mysql-5.5.53Robert Golebiowski2016-09-2811-122/+274
| | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Bug#21977380 - POSSIBLE BUFFER OVERFLOW ISSUESShishir Jaiswal2016-05-161-2/+2
| * | | | | | | | | | | | | MDEV-11127 : Fix innochecksum to work with large files on Windows.Vladislav Vaintroub2016-10-251-5/+50
| * | | | | | | | | | | | | Upstream patch from Debian Bug 838557Kristian Nielsen2016-10-211-2/+3
* | | | | | | | | | | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Fixed compiler error and some warnings on windowsMonty2016-08-231-1/+1
* | | | | | | | | | | | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-242-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-212-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Bug#21977380 - POSSIBLE BUFFER OVERFLOW ISSUESShishir Jaiswal2016-05-161-2/+2
| | | |/ / / / / / / / / / /
| | * | | | | | | | | | | | MDEV-8012: Wrong exit code when asking for helpDan Ungureanu2016-06-121-1/+4