summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | MDEV-8012: Wrong exit code when asking for helpVicențiu Ciorbaru2016-06-121-1/+1
* | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-2910-36/+86
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-269-34/+84
| |\ \ \ | | |/ /
| | * | Merge branch 'bb-5.5-serg' into 5.5mariadb-5.5.49Sergei Golubchik2016-04-209-28/+80
| | |\ \
| | | * \ Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-209-28/+80
| | | |\ \ | | | | |/
| | | | * Bug #22738607: YASSL FUNCTION X509_NAME_GET_INDEX_BY_NID IS NOT WORKING AS E...mysql-5.5.49Yashwant Sahu2016-02-269-28/+80
| | * | | MDEV-9836 Connection lost when using SSLVladislav Vaintroub2016-04-201-4/+0
| | |/ /
| * | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-2/+2
* | | | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-236-15/+40
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-156-15/+40
| |\ \ \ | | |/ /
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-096-15/+40
| | |\ \ | | | |/
| | | * Description: yaSSL was only handling the cases of zero orV S Murthy Sidagam2016-01-046-15/+40
| | | * Updated yassl to yassl-2.3.8Robert Golebiowski2015-09-186-3/+31
| | | * Bug #21025377 CAN'T CONNECT TO SSL ENABLED SERVER FIRST 30 SEC AFTERRobert Golebiowski2015-09-183-2/+9
* | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-43/+26
|\ \ \ \ | |/ / /
| * | | Fixes to get all test to run on MacosX Lion 10.7Monty2015-11-291-43/+26
* | | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-3111-7/+93
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-0911-7/+93
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-10-0811-7/+93
| | |\ \
| | | * | Updated yassl to yassl-2.3.8mysql-5.5.46Robert Golebiowski2015-09-186-3/+31
| | | * | Bug #21025377 CAN'T CONNECT TO SSL ENABLED SERVER FIRST 30 SEC AFTERRobert Golebiowski2015-09-183-2/+9
| | | |/
| | | * Bug #20774956: THREAD_POOL.THREAD_POOL_CONNECT HANGS WHEN RUN ON ARobert Golebiowski2015-07-083-2/+7
| | | * Bug #21025377 CAN'T CONNECT TO SSL ENABLED SERVER FIRST 30 SEC AFTERRobert Golebiowski2015-07-083-2/+12
| | | * Bug #20168526 YASSL: CORRUPT SSL-KEY CRASHES CLIENTRobert Golebiowski2015-07-085-2/+38
* | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-6/+3
|\ \ \ \ | |/ / /
| * | | MDEV-7398 mysqld segfaults on FreeBSD 10.1 i386 when built with clang 3.4Sergei Golubchik2015-06-161-6/+3
* | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2015-02-1811-20/+342
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-1811-20/+342
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42Sergei Golubchik2015-02-1111-20/+342
| | |\ \ | | | |/
| | | * Bug#20201864 : UPGRADE TO YASSL 2.3.7Harin Vadodaria2014-12-3011-20/+342