Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | * | | MDEV-8012: Wrong exit code when asking for help | Vicențiu Ciorbaru | 2016-06-12 | 1 | -1/+1 |
* | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 10 | -36/+86 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 |
| | |/ / | |||||
| * | | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -2/+2 |
* | | | | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 6 | -15/+40 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 6 | -15/+40 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-02-09 | 6 | -15/+40 |
| | |\ \ | | | |/ | |||||
| | | * | Description: yaSSL was only handling the cases of zero or | V S Murthy Sidagam | 2016-01-04 | 6 | -15/+40 |
| | | * | Updated yassl to yassl-2.3.8 | Robert Golebiowski | 2015-09-18 | 6 | -3/+31 |
| | | * | Bug #21025377 CAN'T CONNECT TO SSL ENABLED SERVER FIRST 30 SEC AFTER | Robert Golebiowski | 2015-09-18 | 3 | -2/+9 |
* | | | | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -43/+26 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixes to get all test to run on MacosX Lion 10.7 | Monty | 2015-11-29 | 1 | -43/+26 |
* | | | | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 11 | -7/+93 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-10-09 | 11 | -7/+93 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-10-08 | 11 | -7/+93 |
| | |\ \ | |||||
| | | * | | Updated yassl to yassl-2.3.8mysql-5.5.46 | Robert Golebiowski | 2015-09-18 | 6 | -3/+31 |
| | | * | | Bug #21025377 CAN'T CONNECT TO SSL ENABLED SERVER FIRST 30 SEC AFTER | Robert Golebiowski | 2015-09-18 | 3 | -2/+9 |
| | | |/ | |||||
| | | * | Bug #20774956: THREAD_POOL.THREAD_POOL_CONNECT HANGS WHEN RUN ON A | Robert Golebiowski | 2015-07-08 | 3 | -2/+7 |
| | | * | Bug #21025377 CAN'T CONNECT TO SSL ENABLED SERVER FIRST 30 SEC AFTER | Robert Golebiowski | 2015-07-08 | 3 | -2/+12 |
| | | * | Bug #20168526 YASSL: CORRUPT SSL-KEY CRASHES CLIENT | Robert Golebiowski | 2015-07-08 | 5 | -2/+38 |
* | | | | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -6/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-7398 mysqld segfaults on FreeBSD 10.1 i386 when built with clang 3.4 | Sergei Golubchik | 2015-06-16 | 1 | -6/+3 |
* | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2015-02-18 | 11 | -20/+342 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-02-18 | 11 | -20/+342 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42 | Sergei Golubchik | 2015-02-11 | 11 | -20/+342 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#20201864 : UPGRADE TO YASSL 2.3.7 | Harin Vadodaria | 2014-12-30 | 11 | -20/+342 |