Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix InnoDB/XtraDB compilation warnings on 32-bit builds. | Marko Mäkelä | 2017-03-09 | 1 | -1/+2 |
* | spelling fixes | klemens | 2017-03-07 | 2 | -2/+2 |
* | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 1 | -1/+0 |
|\ | |||||
| * | Fixed compiler warnings | Monty | 2017-02-28 | 1 | -1/+0 |
* | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 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 branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 13 | -129/+327 |
|\ \ \ | |||||
| * \ \ | 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 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 2 | -4/+6 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 10 | -36/+86 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 6 | -15/+40 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -43/+26 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 11 | -7/+93 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -6/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2015-02-18 | 11 | -20/+342 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 8 | -334/+506 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 39 | -430/+703 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 100 | -45894/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 4 | -10/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 85 | -436/+871 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merged revision 3471, 3472 & 3473 from maria-5.5-galera. | Nirbhay Choubey | 2014-03-28 | 1 | -3/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Merged revision 3471, 3472 & 3473 from maria-5.5-galera. | Nirbhay Choubey | 2014-03-27 | 1 | -3/+8 |
* | | | | | | | | | | | | | | | | | | | MDEV-10969: innochecksum dumps core for some .ibd files due to floating point... | Jan Lindström | 2016-10-24 | 1 | -2/+10 |
* | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Fixed compiler error and some warnings on windows | Monty | 2016-08-23 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 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 |
| | * | | | | | | | | | | | | | | | MDEV-8012: Wrong exit code when asking for help | Vicențiu Ciorbaru | 2016-06-12 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 9 | -34/+84 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-04-26 | 9 | -34/+84 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'bb-5.5-serg' into 5.5mariadb-5.5.49 | Sergei Golubchik | 2016-04-20 | 9 | -28/+80 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-04-20 | 9 | -28/+80 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | | Bug #22738607: YASSL FUNCTION X509_NAME_GET_INDEX_BY_NID IS NOT WORKING AS E...mysql-5.5.49 | Yashwant Sahu | 2016-02-26 | 9 | -28/+80 |
| | * | | | | | | | | | | | | | | | | MDEV-9836 Connection lost when using SSL | Vladislav Vaintroub | 2016-04-20 | 1 | -4/+0 |
| | |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 6 | -15/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |