summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-122/+140
|\
| * Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-37/+285
| |\
| * \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-2/+1
| |\ \
| * | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-16/+121
| * | | Backport of:Konstantin Osipov2009-10-161-2/+2
| * | | Backport of:Konstantin Osipov2009-10-161-104/+10
| * | | Bug #33831 mysql_real_connect() connects again if Magne Mahre2009-10-091-0/+7
* | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-1/+1
| |_|/ |/| |
* | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-271-0/+2
|\ \ \
| * \ \ manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Backport BUG#25192 Using relay-log and relay-log-index without values produce...He Zhenxing2009-10-021-0/+2
* | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-231-2/+1
|\ \ \ \ | |/ / /
| * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-2/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Merge from 5.0Staale Smedseng2009-09-171-2/+1
| | |\ \ | | | |/ | | |/|
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-171-2/+1
* | | | WL#1349 Use operating system localization to send it as a default client char...Alexander Barkov2009-10-211-37/+283
|/ / /
* | | auto-mergeIngo Struewing2009-09-301-2/+2
|\ \ \
| * | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-301-2/+2
| |/ /
* | | Bug#37267 - connect() EINPROGRESS failures mishandled in client libraryIngo Struewing2009-09-301-15/+62
|/ /
* | Post fix patch for bug#20577 and bug#46362.Mattias Jonsson2009-09-011-2/+3
* | manual mergeTatiana A. Nurnberg2009-08-311-0/+9
|\ \ | |/
| * Bug#35132: MySQLadmin --wait ping always crashes on Windows systemsTatiana A. Nurnberg2009-08-311-0/+9
* | Merge from 5.0 for 43414Staale Smedseng2009-08-282-4/+2
|\ \ | |/
| * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-282-5/+3
* | Manual merge between bug#46362 and bug#20577.Mattias Jonsson2009-08-281-3/+1
|\ \
| * | Bug#46362: Endpoint should be set to false for TO_DAYS(DATE)Mattias Jonsson2009-08-261-3/+1
* | | Merge from mysql-5.0-bugteam.Davi Arnaut2009-08-131-0/+3
|\ \ \ | |/ / |/| / | |/
| * Bug#46013: rpl_extraColmaster_myisam fails on pb2Davi Arnaut2009-08-131-0/+3
* | Bug#45017: Failure to connect if hostname maps to multiple addressesDavi Arnaut2009-07-301-7/+27
* | Merge from mysql-5.0-bugteam.Davi Arnaut2009-06-101-4/+16
|\ \ | |/
| * Bug#41190: shared memory connections do not work in Vista, if server started ...Davi Arnaut2009-06-101-4/+16
* | Adding missing forward declaration for bug 43560Staale Smedseng2009-05-201-1/+2
* | Recommit of bug 43560 after merge with mysql-5.1-bugteamStaale Smedseng2009-05-201-24/+44
* | auto-mergeIgnacio Galarza2009-03-191-1/+1
|\ \
| * | Fix for bug #40552: Race condition around default_directories Alexey Kopytov2009-02-271-1/+1
* | | auto-mergeIgnacio Galarza2009-03-171-1/+12
|\ \ \ | |/ /
| * | Bug#42146 - DATETIME fractional seconds parse errorTatiana A. Nurnberg2009-02-131-1/+12
* | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-132-3/+3
|\ \ \ | |/ / |/| / | |/
| * Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-102-3/+3
* | auto-mergeTatiana A. Nurnberg2009-01-091-6/+7
|\ \ | |/
| * Bug#41470: DATE_FORMAT() crashes the complete server with a valid dateTatiana A. Nurnberg2009-01-081-6/+7
| * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294cmiller@zippy.cornsilk.net2008-04-031-3/+3
| |\
| * | fixed warnings and compile errors from the fix for bug 26243gkodinov/kgeorge@macbook.gmz2008-03-291-1/+1
| * | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0anozdrin/alik@quad.opbmk2008-03-181-3/+7
| |\ \
* | \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294cmiller@zippy.cornsilk.net2008-04-031-3/+3
|\ \ \ \
| * \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294cmiller@zippy.cornsilk.net2008-04-031-3/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3cmiller@zippy.cornsilk.net2008-04-031-3/+3
| | |/ /
* | | | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1anozdrin/alik@quad.opbmk2008-03-181-4/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Merge buzz.(none):/home/davi/mysql-5.0-runtimedavi@buzz.(none)2008-03-171-3/+7
| |\ \ \ | | | |/ | | |/|
| | * | Bug#35103 mysql_client_test::test_bug29948 causes sporadic failuresdavi@mysql.com/endora.local2008-03-141-3/+7