summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-194-3/+4
|\
| * 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
| * | | | 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
| | | |\
| * | | | 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
* | | | | merge with xtradb-5.5.15Sergei Golubchik2011-07-181-1/+1
* | | | | post-merge fixes.Sergei Golubchik2011-07-021-1/+1
* | | | | 5.5-mergeSergei Golubchik2011-07-026-313/+53
|\ \ \ \ \
| * | | | | BUG#12561297:LIBMYSQLD/EXAMPLE/MYSQL_EMBEDDED IS ABORTING.Mayank Prasad2011-06-141-2/+2
| * | | | | merge from 5.1 for bug#11764633Mayank Prasad2011-05-181-2/+26
| * | | | | MergeKent Boortz2010-12-292-14/+15
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | 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
| * | | | | | Merge 5.5-bug58158 into 5.5-bugteamMagnus Blåudd2010-11-241-2/+1
| |\ \ \ \ \ \
| | * | | | | | Bug#58158 LINK_LIBRARIES for MYSQL_ADD_PLUGIN is not added to libmysqldMagnus Blåudd2010-11-161-2/+1
| * | | | | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-202-282/+0
| * | | | | | | BUG#57108: mysqld crashes when I attempt to install pluginMats Kindahl2010-11-041-1/+2
| |/ / / / / /
| * | | | | | mergeGeorgi Kodinov2010-10-042-14/+14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge of mysql-5.5 into mysql-5.5-wl1054Georgi Kodinov2010-09-202-4/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merged mysql-5.5 into WL1054-5.5Georgi Kodinov2010-08-162-4/+4
| |\ \ \ \ \ \ \ \
| * | | | | | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-095-37/+56
* | | | | | | | | | lots of post-merge changesSergei Golubchik2011-04-253-25/+2
* | | | | | | | | | merge.Sergei Golubchik2010-11-256-44/+99
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | 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
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |