summaryrefslogtreecommitdiff
path: root/sql/sql_bootstrap.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\
| * Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| |\
| | * Update FSF addressVicențiu Ciorbaru2019-05-111-1/+1
* | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2018-01-291-3/+3
|\ \ \ | |/ /
| * | Fix and reenable Windows compiler warning C4800 (size_t conversion).Vladislav Vaintroub2018-01-261-3/+3
* | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-041-2/+2
|\ \ \ | |/ /
| * | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-2/+2
| |/
* | Enusure that my_global.h is included firstMichael Widenius2017-08-241-1/+1
|/
* MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-2/+1
* MDEV-3816 init-file stops getting executed if a long enough line is encounter...Sergei Golubchik2012-12-161-9/+30
* Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-0/+99