summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-38/+21
|\
| * Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-181-34/+20
| |\
| | * Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-221-34/+20
| * | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-4/+7
| |\ \ | | |/ | |/|
| * | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-1/+0
| |\ \
| * \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-14/+0
| |\ \ \
| * | | | Backport of:Konstantin Osipov2009-11-241-1/+1
| * | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-3/+0
| |\ \ \ \
| | * \ \ \ Bug #33544 UDF_INIT member decimals initialized wrong with Magne Mahre2009-11-111-3/+0
| | |\ \ \ \
| | | * | | | Bug #33544: UDF_INIT member decimals initialized wrong with gkodinov/kgeorge@magare.gmz2008-03-051-3/+0
* | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-071-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2010-02-261-0/+1
* | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-231-4/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | 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
* | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-121-1/+0
* | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-422/+98
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-421/+97
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-1/+1
| * | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-6/+8
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+12
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-37/+90
| * | | | | | Backport of:Konstantin Osipov2009-10-161-384/+7
| | |_|/ / / | |/| | | |
* | | | | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-241-14/+0
| |_|/ / / |/| | | |
* | | | | 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
* | | 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
| |\ \
* | \ \ auto-mergeIgnacio Galarza2009-03-171-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
* | | | | 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
| |/ /
| * | fixed warnings and compile errors from the fix for bug 26243gkodinov/kgeorge@macbook.gmz2008-03-291-1/+1
| * | Merge amd64.(none):/src/mysql-5.0-bugteamiggy@amd64.(none)2008-03-281-4/+0
| |\ \
| | * | Bug#26243 mysql command line crash after control-ciggy@amd64.(none)2008-03-281-4/+0
| * | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0anozdrin/alik@quad.opbmk2008-03-181-5/+12
| |\ \ \ | | |/ / | |/| |
* | | | Bug#38522: 5 seconds delay when closing application using embedded serverVladislav Vaintroub2008-12-041-3/+1
* | | | Bug#27430 "Crash in subquery code when in PS and table DDL changed afterkostja@bodhi.(none)2008-05-201-43/+88
* | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@quad.opbmk2008-03-181-5/+12
|\ \ \ \
| * | | | Post-merge fixes for Bug 35103davi@buzz.(none)2008-03-171-1/+1
| * | | | Merge buzz.(none):/home/davi/mysql-5.0-runtimedavi@buzz.(none)2008-03-171-5/+12
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug#35103 mysql_client_test::test_bug29948 causes sporadic failuresdavi@mysql.com/endora.local2008-03-141-5/+12