Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+10 |
|\ | |||||
| * | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -0/+10 |
| |\ | |||||
| | * | MDEV-12190 YASSL isn't able to negotiate TLS version correctly | Vladislav Vaintroub | 2018-03-14 | 1 | -0/+10 |
| * | | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 6 | -16/+38 |
| |\ \ | | |/ | |||||
| * | | Merge tag 'mariadb-5.5.56' into 5.5-galera | Sachin Setiya | 2017-05-03 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54 | Nirbhay Choubey | 2016-12-27 | 2 | -0/+80 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/5.5' into 5.5-galera | Nirbhay Choubey | 2016-10-14 | 11 | -122/+274 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50 | Nirbhay Choubey | 2016-06-23 | 2 | -4/+6 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 9 | -32/+80 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.48' into 5.5-galera | Nirbhay Choubey | 2016-02-13 | 6 | -15/+40 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 11 | -7/+93 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch '5.5' into 5.5-galera | Nirbhay Choubey | 2015-02-18 | 11 | -20/+342 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge revisions from maria/5.5 (5.5.41) | Nirbhay Choubey | 2014-12-22 | 4 | -4/+13 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge revisions from maria/5.5 | Nirbhay Choubey | 2014-12-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-5.5.40 maria/5.5 | Nirbhay Choubey | 2014-10-09 | 138 | -46272/+703 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Local merge of mariadb-5.5.39 | Nirbhay Choubey | 2014-08-06 | 4 | -10/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 86 | -429/+868 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | MDEV#5812 Memory leaks while running mysqld in | Nirbhay Choubey | 2014-03-11 | 1 | -3/+8 |
* | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 8 | -26/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 6 | -17/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2017-10-17 | 4 | -8/+24 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Bug#26482173: TLS CIPHER NEGOTIATION INCORRECTLY MATCHES ON | Arun Kuruvila | 2017-08-24 | 7 | -164/+182 |
| | | * | | | | | | | | | | | | | | | Bug #24740291: YASSL UPDATE TO 2.4.2 | Robert Golebiowski | 2016-09-27 | 11 | -122/+274 |
| | * | | | | | | | | | | | | | | | | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 2 | -8/+14 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Build improvements and cleanups. | Vladislav Vaintroub | 2017-09-08 | 2 | -9/+0 |
* | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 3 | -11/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-05-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | mysqld_safe_help - remove warningmariadb-5.5.56 | Daniel Black | 2017-04-30 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | MDEV-12488 Remove type mismatch in InnoDB printf-like calls | Marko Mäkelä | 2017-04-21 | 1 | -10/+24 |
* | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Fixed compiler warnings | Monty | 2017-02-28 | 1 | -1/+0 |
* | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 2 | -0/+80 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 2 | -0/+80 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | Numerous issues in mysqld_safe | Sergei Golubchik | 2016-12-22 | 2 | -0/+80 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 13 | -129/+327 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-10-25 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-10-25 | 11 | -122/+274 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-10-13 | 11 | -122/+274 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Bug #24740291: YASSL UPDATE TO 2.4.2mysql-5.5.53 | Robert Golebiowski | 2016-09-28 | 11 | -122/+274 |
| | | |/ / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | Bug#21977380 - POSSIBLE BUFFER OVERFLOW ISSUES | Shishir Jaiswal | 2016-05-16 | 1 | -2/+2 |
| * | | | | | | | | | | | | | MDEV-11127 : Fix innochecksum to work with large files on Windows. | Vladislav Vaintroub | 2016-10-25 | 1 | -5/+50 |
| * | | | | | | | | | | | | | Upstream patch from Debian Bug 838557 | Kristian Nielsen | 2016-10-21 | 1 | -2/+3 |
* | | | | | | | | | | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Fixed compiler error and some warnings on windows | Monty | 2016-08-23 | 1 | -1/+1 |
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 2 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 2 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-06-14 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Bug#21977380 - POSSIBLE BUFFER OVERFLOW ISSUES | Shishir Jaiswal | 2016-05-16 | 1 | -2/+2 |
| | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | MDEV-8012: Wrong exit code when asking for help | Dan Ungureanu | 2016-06-12 | 1 | -1/+4 |