summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.2.Michael Widenius2011-12-1111-13/+110
|\
| * Merge with MariaDB 5.1Michael Widenius2011-11-2411-13/+110
| |\
| | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2111-13/+110
| | |\
| | | * Updated/added copyright headersKent Boortz2011-07-031-2/+26
| | | |\
| | | | * Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDEDMayank Prasad2011-05-181-2/+26
| | | * | Updated/added copyright headersKent Boortz2011-06-3010-11/+84
| | | |\ \ | | | | |/ | | | |/|
| | | | * Updated/added copyright headersKent Boortz2011-06-302-5/+7
* | | | | merging.Alexey Botchkov2011-11-121-15/+12
|\ \ \ \ \
| * \ \ \ \ mergeSergei Golubchik2011-10-111-15/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge with 5.1Sergei Golubchik2011-10-071-15/+12
| | |\ \ \ \ | | | |/ / /
| | | * | | support for plugins on windowsSergei Golubchik2011-10-041-15/+12
* | | | | | gis-related tests fixes.Alexey Botchkov2011-06-204-3/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge with 5.2Michael Widenius2011-05-161-1/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix Windows embedded warningsVladislav Vaintroub2011-05-101-1/+0
| * | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Added calls to cleanup_mutexes() for embedded library.Michael Widenius2011-04-281-0/+2
| * | | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree.unknown2011-05-032-2/+3
| |\ \ \ \ \
| | * | | | | Backport MySQL WL#2540 into MariaDB.unknown2011-05-032-2/+3
* | | | | | | Precise GIS functions added.Alexey Botchkov2011-05-042-0/+2
|/ / / / / /
* | | | | | mergeVladislav Vaintroub2011-03-281-6/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | CMake/code signing: Vladislav Vaintroub2011-03-281-6/+1
* | | | | | merge mwl#55Vladislav Vaintroub2011-03-112-15/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge 5.2Vladislav Vaintroub2011-03-101-14/+0
| |\ \ \ \ \ | | |/ / / /
| * | | | | workaround CMake bug 11240 (problems making mysqlserver.lib on Win64)Vladislav Vaintroub2011-02-011-1/+7
| * | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-292-14/+19
* | | | | | Merge with 5.2Michael Widenius2011-03-091-14/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-282-14/+6
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Fixed build failuresMichael Widenius2011-02-231-0/+6
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-14/+0
| | |\ \ \ | | | |/ /
| | | * | MergeKent Boortz2010-12-292-14/+15
| | | |\ \ | | | | |/
| | | | * - Added/updated copyright headersKent Boortz2010-12-282-14/+15
| | | | * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-1/+1
* | | | | Workaround CMake bug http://www.vtk.org/Bug/view.php?id=11240Vladislav Vaintroub2011-02-121-0/+6
* | | | | mergeVladislav Vaintroub2010-12-061-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | mergeVladislav Vaintroub2010-12-061-2/+0
| |\ \ \ \ | | |/ / /
| | * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-2/+0
* | | | | Merge with 5.1-release.Michael Widenius2010-12-062-113/+21
|\ \ \ \ \ | |/ / / /
| * | | | merge with 5.1Michael Widenius2010-11-301-3/+0
| |\ \ \ \ | | |/ / /
| | * | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-3/+0
| * | | | Merge MariaDB 5.1->5.2unknown2010-11-192-110/+21
| |\ \ \ \ | | |/ / /
| | * | | MWL#74: Shared libmysqld.so library.unknown2010-11-172-110/+21
* | | | | fix windows embeddedSergei Golubchik2010-11-021-1/+2
* | | | | Merge 5.2->5.3Sergey Petrunya2010-10-103-4/+6
|\ \ \ \ \ | |/ / / /
| * | | | merge with 5.1Sergei Golubchik2010-09-112-4/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge with MySQL 5.1.50Michael Widenius2010-08-272-4/+2
| | |\ \ \ | | | |/ /
| | | * | Fix for bug #50667: The InnoDB plugin prevents initializationRamil Kalimullin2010-07-161-1/+2
| * | | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Remove the file libmysqld.exp from the installerBo Thorsen2010-07-011-2/+0
| | * | | Hardcode the build path for the installer temporarilyBo Thorsen2010-07-011-1/+2