summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | Fix cpack runBo Thorsen2010-07-011-1/+1
| | * | | Install the files for the embedded serverBo Thorsen2010-06-281-0/+5
* | | | | Subquery cache (MWL#66) added.unknown2010-07-101-1/+2
* | | | | Add sql/opt_index_cond_pushdown.cc to CMakeLists.txt filesSergey Petrunya2010-06-271-0/+1
* | | | | Fix windows build: add sql/opt_subselect.cc to CMakeLists.txt filesSergey Petrunya2010-06-271-0/+1
* | | | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-265-47/+69
|\ \ \ \ \ | |/ / / /
| * | | | crash on --with-embedded-privilege-control builds:Sergei Golubchik2010-05-141-0/+2
| * | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-082-2/+3
| * | | | more fixes for windows and status_user.testSergei Golubchik2010-04-021-1/+1
| * | | | pluggable auth with plugin examplesSergei Golubchik2010-03-294-43/+62
| |/ / /
* | | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-204-2/+18
|\ \ \ \ | |/ / /
| * | | Fix windows build of embedded server (forgotten dependency).unknown2010-01-311-1/+1
| * | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-1/+0
| |\ \ \ | | |/ /
| | * | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-241-1/+0
| * | | Merge with MySQL 5.1, with following additions:unknown2009-11-165-1/+18
| |\ \ \ | | |/ /
| | * | Automerge.Davi Arnaut2009-11-021-0/+1
| | |\ \ | | | |/
| | | * Bug#41728: Dropped symbol but no soname changeDavi Arnaut2009-09-291-0/+1
| | * | Bug #47795 CMake, storage engine name different from directory nameMagnus BlÄudd2009-10-081-2/+11
| | * | auto-mergeIngo Struewing2009-10-021-0/+3
| | |\ \
| | | * \ mergingAlexey Botchkov2009-09-295-69/+41
| | | |\ \