summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-02-201-61/+230
|\
| * upmerge 51135Bjorn Munch2010-02-181-11/+21
| |\
| | * upmerge 51135Bjorn Munch2010-02-181-10/+21
| | |\
| | | * Bug #51135 Please increase the maximum number of connections allowed in mysql...Bjorn Munch2010-02-171-10/+21
| * | | new merge from next-mrBjorn Munch2010-02-161-1/+2
| |\ \ \
| * \ \ \ upmerge 31602,47389,50618Bjorn Munch2010-02-111-5/+17
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | upmerge 31602,47389,50618Bjorn Munch2010-02-111-5/+17
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug #50618 Please allow 'sleep $variable' in mtrBjorn Munch2010-02-091-5/+17
| | | * | merge from 5.1 mainBjorn Munch2010-02-076-19/+59
| | | |\ \
| | | * | | Bug #39774 mysql-test-run's remove_file can't use wildcards, this should be d...Bjorn Munch2010-02-041-1/+78
| | * | | | merge from mysql-trunkBjorn Munch2010-02-075-19/+55
| | |\ \ \ \
| | | * \ \ \ Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-303-6/+10
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-245-10/+41
| | | |\ \ \ \
| * | | \ \ \ \ 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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | upmerge 43005,48888,49837,49878,50471Bjorn Munch2010-01-201-4/+33
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | merge 49837Bjorn Munch2010-01-201-0/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug #49837 mysqltest exec cannot handle multi-line command correctlyBjorn Munch2010-01-201-0/+4
| | | * | | | | | | merge 48888Bjorn Munch2010-01-201-2/+2
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Bug #48888 mysqltest crashes on --replace_result if 'from' is longer than ~10...Bjorn Munch2010-01-201-2/+2
| | | | |/ / / / / /
| | | * | | | | | | Bug #49878 delimiter under false 'if' makes mysqltest test fail with 'Missing...Bjorn Munch2010-01-201-1/+19
| | | * | | | | | | exporting server version and other as env var (bug#50471)Bernd Ocklin2010-01-201-1/+8
| | | |/ / / / / /
| * | | | | | | | merge from next-mrBjorn Munch2010-01-194-15/+20
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ upmerge 49269 amendmentBjorn Munch2010-01-071-4/+3
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | upmerge 49269 amendmentBjorn Munch2010-01-071-4/+3
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'Bjorn Munch2010-01-071-4/+3
| * | | | | | | | | upmerge 49269 amendmentBjorn Munch2010-01-061-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | upmerge 49269 amendmentBjorn Munch2010-01-061-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'Bjorn Munch2010-01-061-0/+1
| * | | | | | | | | merge 48863,49269,49345,49672,49761Bjorn Munch2010-01-061-4/+36
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | merge 48863,49269,49345,49672,49761Bjorn Munch2010-01-061-4/+36
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'Bjorn Munch2010-01-061-2/+12
| | | * | | | | | | Bug #48863 mysql test: enable and disable case insensitive compare modeBjorn Munch2010-01-061-2/+24
| | | * | | | | | | Merge from 5.1 mainBjorn Munch2009-12-163-44/+128
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | backport mysqltest send_eval from 42520Bjorn Munch2009-12-161-2/+4
| | * | | | | | | | | merge from trunkBjorn Munch2009-12-211-0/+4
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge from trunkBjorn Munch2009-12-1616-289/+308
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | merge from mysql-next-mrBjorn Munch2010-01-044-78/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge from next-mrBjorn Munch2009-12-214-11/+49
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge from next-mrBjorn Munch2009-12-1615-329/+784
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ merge 48250, 48918, 49096Bjorn Munch2009-11-261-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Bug #48250 mysqtest_embedded can lock destroyed mutexBjorn Munch2009-11-261-4/+4
| * | | | | | | | | | | | | | upmerge 35543,48367,48671,48806,48808Bjorn Munch2009-11-191-32/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Bug #48671 mysqltest fails on 'perl' in file sourced inside 'while'Bjorn Munch2009-11-111-32/+41
* | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |