summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Correctly cast the result of malloc.Vladislav Vaintroub2010-01-201-1/+1
* Fix compatibility problem with older HPUXVladislav Vaintroub2010-01-191-1/+1
* Fix various compiler/OS compatibility errorsVladislav Vaintroub2010-01-191-1/+16
* mergeVladislav Vaintroub2010-01-182-2/+3
|\
| * merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-132-13/+17
| |\
| * \ Manual merge from next-mr.unknown2010-01-124-78/+15
| |\ \
| * \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-072-2/+3
| |\ \ \
| | * \ \ merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-172-9/+4
| | |\ \ \
| | * \ \ \ Merging with mysql-5.1-rep+2Mats Kindahl2009-12-152-2/+3
| | |\ \ \ \
| | | * | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-142-2/+3
* | | | | | | mergeVladislav Vaintroub2010-01-131-12/+16
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Backporting revision from mysql-6.0-codebase-bugfixing.Alexander Nozdrin2010-01-111-8/+12
| * | | | | | Backporting revision from mysql-6.0-codebase-bugfixing.Alexander Nozdrin2010-01-111-10/+10
* | | | | | | mergeVladislav Vaintroub2010-01-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | mergeVladislav Vaintroub2009-12-254-78/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Manual merge of WL#4738 from mysql-next-mr: Alexey Kopytov2009-12-282-4/+7
| |\ \ \ \ \
| | * | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-222-4/+7
| | |/ / / /
| * | | | | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-222-74/+8
| |/ / / /
* | | | | mergeVladislav Vaintroub2009-12-191-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-173-11/+45
| |\ \ \ \
| * \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-0/+4
| |\ \ \ \ \
| | * \ \ \ \ Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-14/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-0/+4
| | |\ \ \ \ \ \
| | | * | | | | | This is a patch for bug#41569.unknown2009-12-031-0/+4
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | mergeVladislav Vaintroub2009-12-193-11/+45
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-162-19/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-1110-12/+28
| |\ \ \ \ \ \ \
| * | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-093-11/+45
* | | | | | | | | Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are insta...Vladislav Vaintroub2009-12-171-24/+10
* | | | | | | | | mergeVladislav Vaintroub2009-12-162-19/+3
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-14/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-14/+0
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-5/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | / / / / | | |_|/ / / / | |/| | | | |
| | * | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1115-268/+217
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | merge to mysql-5.1-bugteamSatya B2009-11-261-3/+1
| | |\ \ \ \ \
| | | * \ \ \ \ auto-mergeTatiana A. Nurnberg2009-11-241-3/+1
| | | |\ \ \ \ \
| | | | * | | | | Bug#47655: Memory free error when connecting to 4.1 server from 5.1+ clientTatiana A. Nurnberg2009-11-021-3/+1
| | * | | | | | | Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39Satya B2009-11-251-2/+2
| | |/ / / / / /
| | * | | | | | Post-merge fixes: fix typo and remove unused variables.Davi Arnaut2009-11-211-4/+1
* | | | | | | | Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined...Vladislav Vaintroub2009-12-121-2/+1
* | | | | | | | mergeVladislav Vaintroub2009-12-1110-12/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-1/+18
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-256-24/+24
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-208-26/+430
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merging.Alexey Botchkov2009-11-1710-12/+28
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Bug#47216 programs should quit if the file specified by --defaults-file ...Alexey Botchkov2009-10-0910-13/+28
* | | | | | | | | | mergeVladislav Vaintroub2009-12-021-1/+18
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-1/+18
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-303-37/+126
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |