summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-1/+1
|\
| * Bug #49223 Change help description for mysqldumpStaale Smedseng2010-01-271-1/+1
| * WL#5182 Remove more deprecated 4.1/5.0 featuresMagne Mahre2010-01-273-5/+9
| * WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-215-10/+41
* | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-1/+1
|\ \
| * \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-251-1/+1
| |\ \ | | |/
| | * mergeGeorgi Kodinov2009-12-241-1/+1
| | |\
| | | * Bug #48866: mysql.test fails under Fedora 12Georgi Kodinov2009-12-161-1/+1
* | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-186-93/+35
|\ \ \ \
| * \ \ \ merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-132-13/+17
| |\ \ \ \
| | * | | | 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
| | * | | | WL#2360 Performance schemaMarc Alff2010-01-061-1/+1
| * | | | | Manual merge from next-mr.2010-01-124-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
| | |/ / / /
| * | | | | 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
* | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-242-3/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-232-3/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Manual merge.Davi Arnaut2009-12-181-2/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-2/+2
| | | * | | | Backport fix for Bug #27884.Jim Winstead2009-11-231-4/+7
| | * | | | | Merge approved bug fixJim Winstead2009-12-171-1/+2
| | |\ \ \ \ \
| | | * | | | | The mysql command line client ignored the --skip-column-names optionJim Winstead2009-09-211-1/+2
* | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-173-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
* | | | | | | | | | | 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.lars-erik.bjork@sun.com2009-12-031-0/+4
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | 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
* | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-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
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | mergeVladislav Vaintroub2009-11-033-38/+57
| | | |\ \ \ \ \ \
| | * | | | | | | | Bug #48463 backporting from 6.0-rpl to celosia a set of bugsAndrei Elkin2009-11-201-1/+18
View Lorry Controller Status