summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 5.2 -> 5.3Sergei Golubchik2013-02-281-1/+1
|\
| * 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-1/+1
| |\
| | * mysql-5.1 mergeSergei Golubchik2013-02-281-1/+1
| | |\
| | | * Applying patch for Bug#67177 Bug#15967374 from KentHery Ramilison2013-01-081-1/+1
* | | | 5.2 merge.Sergei Golubchik2012-08-223-8/+4
|\ \ \ \ | |/ / /
| * | | 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.2 mergeSergei Golubchik2012-05-201-0/+2
|\ \ \ \ | |/ / /
| * | | 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
|\ \ \ \ | |/ / /
| * | | 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.2Michael Widenius2012-02-211-0/+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
* | | | | 5.2->5.3 mergeSergei Golubchik2011-12-121-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-021-1/+1
* | | | | 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