summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-241-2/+1
|\
| * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-221-1/+0
| |\
| * \ 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
* | | | 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
* | | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-10/+0
* | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-117-728/+125
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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-trunk-merge.Alexander Nozdrin2009-11-062-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
| * | | | | | | | Backport of:Konstantin Osipov2009-10-162-270/+1
| * | | | | | | | Bug #33831 mysql_real_connect() connects again if Magne Mahre2009-10-091-0/+3
| * | | | | | | | Backport the following revision from 6.0:Konstantin Osipov2009-10-091-9/+0
| |/ / / / / / /
| * | | | | | | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-301-2/+0
| * | | | | | | Backport of the patch Vladislav Vaintroub2009-09-301-1/+1
| * | | | | | | Windows improvements : manual backport of Vladislav Vaintroub2009-09-301-17/+1
| * | | | | | | mergeVladislav Vaintroub2009-09-231-2/+1
| |\ \ \ \ \ \ \
| * | | | | | | | This is the downport ofVladislav Vaintroub2009-09-111-1/+1
* | | | | | | | | 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
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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
* | | | | | 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-5.1-bugteam.Alexander Nozdrin2009-09-161-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
* | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-1/+1
|\ \ \ | |/ /
| * | Auto-mergeIgnacio Galarza2009-07-311-1/+1
| |\ \ | | |/
| | * Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-311-1/+1
| | * auto-mergeIgnacio Galarza2009-03-191-2/+2
| | |\
* | | \ Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-2/+2
|\ \ \ \ | |/ / /
View Lorry Controller Status