summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-313-4/+3
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-2415-294/+628
|\
| * Bug#51832 mysql_upgrade failing on performance_schema tables in mysql-trunkAlexander Nozdrin2010-03-091-1/+1
| * A follow-up on WL#5154 and WL#5182: remove forgotten options.Alexander Nozdrin2010-03-032-5/+0
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-2410-142/+165
| |\
| * | Bug#10143 Perror not showing error descriptionMarc Alff2010-02-231-1/+2
| * | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-222-43/+47
| |\ \
| | * \ mergeVladislav Vaintroub2010-02-201-61/+230
| | |\ \
| | * \ \ mergeVladislav Vaintroub2010-02-161-1/+2
| | |\ \ \
| | * \ \ \ mergeVladislav Vaintroub2010-02-062-5/+6
| | |\ \ \ \
| | * | | | | 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
| | |\ \ \ \ \
| | * \ \ \ \ \ mergeVladislav Vaintroub2010-01-131-12/+16
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ mergeVladislav Vaintroub2010-01-111-1/+1
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-254-78/+15
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-191-0/+4
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-193-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
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined...Vladislav Vaintroub2009-12-121-2/+1
| | * | | | | | | | | | | | mergeVladislav Vaintroub2009-12-1110-12/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-021-1/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-11-256-24/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-11-208-30/+430
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ automergeVladislav Vaintroub2009-11-133-27/+112
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-091-32/+40
| * | | | | | | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-202-62/+232
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | upmerge 51135Bjorn Munch2010-02-181-11/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ upmerge 51135Bjorn Munch2010-02-181-10/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ new merge from next-mrBjorn Munch2010-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
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | upmerge 31602,47389,50618Bjorn Munch2010-02-111-5/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | upmerge 31602,47389,50618Bjorn Munch2010-02-111-5/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge from mysql-trunkBjorn Munch2010-02-075-19/+55
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge from next-mrBjorn Munch2010-02-072-5/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | upmerge 39774Bjorn Munch2010-02-041-1/+78
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | upmerge 39774Bjorn Munch2010-02-041-1/+78
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | Bug #39774 mysql-test-run's remove_file can't use wildcards, this should be d...Bjorn Munch2010-02-041-1/+78
| | * | | | | | | | | | | | | | | | | | | | | | | upmerge 43005,48888,49837,49878,50471Bjorn Munch2010-01-201-4/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / /