summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-184-39/+26
|\
| * Enable WL#4435.Alexander Nozdrin2010-01-121-1/+2
| * Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-251-2/+1
| |\
| * | Fixed a Windows build failureAlexey Kopytov2009-12-221-1/+1
| * | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-223-38/+24
* | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-241-4/+7
|\ \ \ | |_|/ |/| |
| * | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-241-2/+1
| |\ \
| | * \ Manual merge from mysql-trunk.Alexander Nozdrin2009-12-221-1/+0
| | |\ \
| * | \ \ 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 from mysql-next-mr.Alexander Nozdrin2009-12-221-1/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-1/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 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
* | | | | | | Automerge the changes of version 5.5.0-m2.Joerg Bruehe2009-12-161-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Automerge the build fixes of 5.5.0-m2 back into the tree.Joerg Bruehe2009-12-161-2/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Disable WL#4435.MySQL Build Team2009-11-171-2/+1
* | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-10/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-10/+0
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-122-15/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-117-728/+125
| |\ \ \ \ \ | | |/ / / /
| * | | | | Automerge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-11-262-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
| | | |/ / | | |/| |
* | | | | WL#2360 Performance schemaMarc Alff2009-11-302-4/+7
* | | | | 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 unknown2008-03-051-3/+0
* | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-057-704/+109
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | 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-5.1.Alexander Nozdrin2009-11-051-6/+8
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Automerge.Davi Arnaut2009-11-031-6/+8
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Fix compiler warnings -- tag unused parameters.Davi Arnaut2009-11-031-6/+8
* | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-0/+13
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-052-0/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | Automerge.Davi Arnaut2009-11-022-0/+13
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug#41728: Dropped symbol but no soname changeDavi Arnaut2009-09-292-0/+13
* | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-0/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+6
| |\ \ \ \ \
| | * | | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-231-0/+6
| | | |/ / / | | |/| | |
* | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-1/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-1/+5
* | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-222-40/+97
* | | | | | Backport of:Konstantin Osipov2009-10-161-1/+1
* | | | | | Backport of:Konstantin Osipov2009-10-161-384/+7