summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-02-161-1/+2
|\
| * Merge next-mr -> next-4284.Konstantin Osipov2010-02-062-5/+6
| |\
| * \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-052-2/+3
| |\ \
| * \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-12/+16
| |\ \ \
| * \ \ \ Merge next-mr -> next-4284Konstantin Osipov2010-02-031-1/+1
| |\ \ \ \
| * \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-032-4/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge next-mr -> next-4284. Konstantin Osipov2010-02-022-74/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-0/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-025-30/+48
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-1510-12/+28
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-1/+2
* | | | | | | | | | | mergeVladislav Vaintroub2010-02-062-5/+6
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |