summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Expand)AuthorAgeFilesLines
* fixes for get_password():Sergei Golubchik2012-01-121-8/+4
* 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-022-16/+16
* Merge with MariaDB 5.1Michael Widenius2011-11-245-11/+13
|\
| * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-215-11/+13
| |\
| | * Updated/added copyright headersKent Boortz2011-07-032-4/+4
| | |\
| | * \ Updated/added copyright headersKent Boortz2011-06-304-10/+12
| | |\ \
| | | * | Updated/added copyright headersKent Boortz2011-06-303-7/+10
* | | | | Small CMake fixes :Vladislav Vaintroub2011-05-151-6/+4
* | | | | Merge with MariaDB 5.1Michael Widenius2011-05-032-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-022-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1Magne Mahre2011-03-282-2/+2
| | |/ /
* | | | CMake/code signing: Vladislav Vaintroub2011-03-281-5/+2
* | | | merge 5.2Vladislav Vaintroub2011-03-103-2/+11
|\ \ \ \
| * \ \ \ Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-283-2/+11
| |\ \ \ \ | | |/ / /
| | * | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed...Michael Widenius2011-02-241-0/+8
| | * | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-4/+6
| | |\ \ \ | | | |/ /
| | | * | Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-248-16/+8
| | | |\ \ | | | | |/
| | | | * A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remov...Alexander Nozdrin2010-11-248-16/+8
| | | * | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-2/+2
| | * | | Merge with 5.1Michael Widenius2011-01-302-1/+2
* | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-10/+4
|/ / / /
* | | | mergeVladislav Vaintroub2010-12-061-3/+0
|\ \ \ \ | |/ / /
| * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-3/+0
* | | | merge with 5.1Michael Widenius2010-11-302-5/+4
|\ \ \ \ | |/ / /
| * | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-3/+0
| * | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-2/+4
| |\ \ \ | | |/ /
| | * | Fixed bug #47485 - mysql_store_result returns a not NULL result setDmitry Shulga2010-09-071-2/+4
* | | | merge with 5.1Sergei Golubchik2010-09-112-3/+1
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-272-3/+1
| |\ \ \ | | |/ /
| | * | Fix what is probably the result of a bad merge. No functional change.Davi Arnaut2010-07-061-0/+1
| | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-022-2/+1
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-5/+25
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-5/+25
| |\ \ \ | | |/ /
| | * | Automerge.Alexey Kopytov2010-07-011-1/+1
| | |\ \
| | | * | Bug#54667: Unnecessary signal handler redefinitionAlexey Kopytov2010-07-011-1/+1
| | * | | Bug #53899 Wrong mysql_stmt_errno() after connection loss withStaale Smedseng2010-06-301-4/+24
| | |/ /
* | | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+8
|\ \ \ \ | |/ / /
| * | | Implement an NSIS based installerBo Thorsen2010-06-251-0/+8
* | | | merge 5.1->5.2Sergei Golubchik2010-06-011-0/+1
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+1
| |\ \ \ | | |/ /
| | * | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2010-02-261-0/+1
* | | | pluggable auth with plugin examplesSergei Golubchik2010-03-295-91/+37
|/ / /
* | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-4/+6
|\ \ \ | |/ /
| * | Manual merge.Davi Arnaut2009-12-181-2/+5
| |\ \ | | |/
| | * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-2/+5
| * | Merge approved bug fixJim Winstead2009-12-161-2/+2
| |\ \
| | * | Fix C99 aliasing violation due to mismatched types that were papered overJim Winstead2009-11-231-2/+2
| * | | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-121-1/+0
* | | | Merge with MySQL 5.1.42Michael Widenius2010-01-152-15/+0
|\ \ \ \ | |/ / /
| * | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-242-15/+0
| |/ /