summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the ins...Vladislav Vaintroub2016-05-242-5/+12
* bump the VERSIONDaniel Bartholomew2016-04-301-1/+1
* Fix crash due to heap corruption in main.shmmariadb-10.0.25Vladislav Vaintroub2016-04-281-1/+1
* MDEV-9988 - Insert cast to suppress -Wdynamic-class-memaccessSergey Vojtovich2016-04-282-5/+6
* Fix msxml6 search in Connect engine on Windows,Vladislav Vaintroub2016-04-271-31/+4
* after-merge fixes for failures in buildbotSergei Golubchik2016-04-272-4/+3
* Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-04-2618-112/+591
|\
| * Merge branch 'ob-10.0' into 10.0Olivier Bertrand2016-04-258-25/+412
| |\
| | * - Fix an error causing MYSQL table to fail saying "no result set"Olivier Bertrand2016-04-258-25/+412
| * | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2016-03-254-13/+57
| |\ \ | | |/
| | * - Fix MDEV-9779. Avoid buffer overflow when setting partname.Olivier Bertrand2016-03-252-11/+13
| | * Bigger partname to avoid MDEV-9779Olivier Bertrand2016-03-251-1/+1
| | * - Fix MDEV-9779. Connection was not recognized in the option list.Olivier Bertrand2016-03-243-2/+44
| * | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2016-03-192-16/+15
| |\ \ | | |/
| | * - Fix compile error when copying a string on itself.Olivier Bertrand2016-03-192-16/+15
| * | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2016-03-177-42/+95
| |\ \ | | |/
| | * - Fix crash when sorting a TBL table with thread=yes.Olivier Bertrand2016-03-163-4/+4
| | * - Fix MDEV-9603 compiler error.Olivier Bertrand2016-03-166-40/+93
| * | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2016-02-201-11/+13
| |\ \ | | |/
| | * - Fix to MDEV-9579 be testing for void result.Olivier Bertrand2016-02-201-11/+13
* | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-04-2621-165/+664
|\ \ \
| * | | 5.6.29-76.2Sergei Golubchik2016-04-2621-162/+601
* | | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-04-269-130/+355
|\ \ \ \
| * | | | 5.6.30Sergei Golubchik2016-04-268-129/+354
* | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-26109-319/+1309
|\ \ \ \ \
| * | | | | MDEV-9987 - gen_lex_hash leaks memory, making LeakSanitizer builds failSergey Vojtovich2016-04-261-0/+2
| * | | | | MDEV-9986 Full-text search of the utf8mb4 column causes crashSergei Golubchik2016-04-263-0/+29
| * | | | | disable main.wait_timeout_not_windows for embeddedSergei Golubchik2016-04-261-0/+1
| * | | | | MDEV-7775 Wrong error message (Unknown error) when idle sessions are killed a...Sergei Golubchik2016-04-253-1/+20
| * | | | | support SEARCH_RANGE in search_pattern_in_file.incSergei Golubchik2016-04-251-1/+16
| * | | | | MDEV-9975 - main.partition_innodb_plugin fails sporadicallySergey Vojtovich2016-04-241-5/+1
| * | | | | MDEV-9142 :Adding Constraint with no database referenceJan Lindström2016-04-235-7/+113
| * | | | | Fixed compilation failure due to unused var.Sergey Vojtovich2016-04-231-2/+2
| * | | | | MDEV-9970 - main.sp-threads fails sporadicallySergey Vojtovich2016-04-232-9/+9
| * | | | | bump the VERSIONDaniel Bartholomew2016-04-221-1/+1
| * | | | | MDEV-9372 select 100 between 1 and 9223372036854775808 returns falseAlexander Barkov2016-04-223-2/+20
| * | | | | Merge branch 'bb-5.5-serg' into 5.5mariadb-5.5.49Sergei Golubchik2016-04-2072-242/+925
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-04-206-27/+60
| | |\ \ \ \ \
| | | * | | | | 5.5.48-37.8Sergei Golubchik2016-04-186-19/+62
| | * | | | | | use consistent error messaging for IGNORESergei Golubchik2016-04-205-63/+11
| | * | | | | | trivial optimizationSergei Golubchik2016-04-201-2/+4
| | * | | | | | another test case for ER_DATA_OUT_OF_RANGE on insertSergei Golubchik2016-04-202-0/+13
| | * | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-2048-159/+476
| | |\ \ \ \ \ \
| | | * | | | | | Bug #22738607: YASSL FUNCTION X509_NAME_GET_INDEX_BY_NID IS NOT WORKING AS E...mysql-5.5.49Yashwant Sahu2016-02-269-28/+80
| | | * | | | | | BUG#20574550 MAIN.MERGE TEST CASE FAILS IF BINLOG_FORMAT=ROWVenkatesh Duggirala2016-02-268-10/+104
| | | * | | | | | (no commit message)Arun Kuruvila2016-02-231-3/+11
| | | * | | | | | (no commit message)Arun Kuruvila2016-02-231-8/+8
| | | * | | | | | (no commit message)Arun Kuruvila2016-02-231-3/+6
| | | * | | | | | WL#9072: Backport WL#8785 to 5.5Ramil Kalimullin2016-02-1918-41/+265
| | | * | | | | | BUG#22037930: INSERT IGNORE FAILS TO IGNORE FOREIGN KEYNisha Gopalakrishnan2016-02-116-13/+141