summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.1Michael Widenius2010-11-301-2/+4
|\
| * 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-111-0/+1
|\ \ \ | |/ /
| * | Merge with MySQL 5.1.50Michael Widenius2010-08-271-0/+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-021-1/+0
* | | 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
| | |/
* | | 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-291-82/+21
|/ /
* | 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-151-14/+0
|\ \ \ \ | |/ / /
| * | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-241-14/+0
| |/ /
* | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-0/+14
|\ \ \
| * \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+14
| |\ \ \ | | |/ /
| | * | Automerge.Davi Arnaut2009-11-031-6/+8
| | |\ \ | | | |/
| | | * Fix compiler warnings -- tag unused parameters.Davi Arnaut2009-11-031-6/+8
| | * | Automerge.Davi Arnaut2009-11-021-0/+12
| | |\ \ | | | |/
| | | * Bug#41728: Dropped symbol but no soname changeDavi Arnaut2009-09-291-0/+12
* | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-2/+2
|/ / /
* | | Merge Mysql 5.1.39 merge into MariaDB trunkunknown2009-11-061-2/+1
|\ \ \
| * \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-2/+1
| |\ \ \ | | |/ /
| | * | Merge from 5.0 for 43414Staale Smedseng2009-08-281-2/+1
| | |\ \ | | | |/
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-2/+1
| | | * auto-mergeIgnacio Galarza2009-03-191-2/+2
| | | |\
* | | | | Fixes for binary distribution in tar fileMichael Widenius2009-10-231-1/+2
|/ / / /
* | | | Added client functions:Michael Widenius2009-10-021-0/+12
* | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-3/+3
|\ \ \ \ | |/ / /
| * | | auto-mergeIgnacio Galarza2009-03-171-2/+2
| |\ \ \
| * \ \ \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-3/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-3/+3
* | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-2/+2
|\ \ \ \ \
| * \ \ \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-2/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge into dev tree.Alexey Kopytov2009-02-101-2/+2
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | Fix for bug #21205: Different number of digits for float/double/real in --ps-...Alexey Kopytov2009-01-281-2/+2
| | | |/
| | | * fixed warnings and compile errors from the fix for bug 26243unknown2008-03-291-1/+1
| | | * Merge amd64.(none):/src/mysql-5.0-bugteamunknown2008-03-281-4/+0
| | | |\
| | | | * Bug#26243 mysql command line crash after control-cunknown2008-03-281-4/+0
| | | * | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0unknown2008-03-181-5/+12
| | | |\ \ | | | | |/ | | | |/|