summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 5.1 mergeSergei Golubchik2012-08-223-8/+4
|\
| * merge with MySQL 5.1.65Sergei Golubchik2012-08-223-8/+4
| |\
| | * Merge unpushed changes from 5.1.64-releaseBjorn Munch2012-07-121-6/+0
| | |\
| | | * Solve a linkage problem with "libmysqld" on several Solaris platforms:Kent Boortz2012-06-261-6/+0
| | * | mysql_client_test did not build within limbysqld/examplesBjorn Munch2012-07-102-2/+4
| | |/
* | | 5.1 mergeSergei Golubchik2012-05-181-0/+2
|\ \ \ | |/ /
| * | merge with mysql-5.1.63Sergei Golubchik2012-05-171-0/+2
| |\ \ | | |/
| | * BUG#13738989 : 62136 : FAILED TO FETCH SELECT RESULT USING EMBEDDED MYSQLDMayank Prasad2012-04-061-0/+2
* | | mergeSergei Golubchik2012-04-051-2/+1
|\ \ \ | |/ /
| * | mysql-5.1.62 mergeSergei Golubchik2012-04-051-2/+1
| |\ \ | | |/
| | * Updated/added copyright headersKent Boortz2012-02-151-2/+1
| | |\
* | | \ Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-201-0/+1
|\ \ \ \ | |/ / /
| * | | Merge with MYSQL 5.1.61Michael Widenius2012-02-201-0/+1
| |\ \ \ | | |/ /
| | * | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-0/+1
* | | | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-021-1/+1
* | | | 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
* | | | merge with 5.1Sergei Golubchik2011-10-071-15/+12
|\ \ \ \ | |/ / /
| * | | support for plugins on windowsSergei Golubchik2011-10-041-15/+12
* | | | Fix Windows embedded warningsVladislav Vaintroub2011-05-101-1/+0
* | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-0/+2
|\ \ \ \ | |/ / /
| * | | Added calls to cleanup_mutexes() for embedded library.Michael Widenius2011-04-281-0/+2
* | | | CMake/code signing: Vladislav Vaintroub2011-03-281-6/+1
* | | | merge 5.2Vladislav Vaintroub2011-03-101-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 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
|/ / / /
* | | | 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.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 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