summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-121-2/+2
* Auto-merge from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-121-0/+3
|\
| * fix for Bug #55672 "mysql_upgrade dies with internal error":Guilhem Bichot2010-08-111-0/+3
* | merge from trunk-mtrBjorn Munch2010-08-051-30/+99
|\ \ | |/ |/|
| * upmerge 55582Bjorn Munch2010-08-051-1/+16
| |\
| | * merge from 5.1Bjorn Munch2010-08-0410-399/+413
| | |\
| | * | Bug #55582 mtr root detection (and if-expression execution) brokenBjorn Munch2010-08-031-1/+16
| * | | merge from trunkBjorn Munch2010-07-2315-329/+164
| |\ \ \
| * \ \ \ merge from trunkBjorn Munch2010-07-141-1/+1
| |\ \ \ \
| * \ \ \ \ merge from trunkBjorn Munch2010-06-1711-456/+461
| |\ \ \ \ \
| * \ \ \ \ \ upmerge 52321,53374,53949,54111,54364,54368Bjorn Munch2010-06-151-2/+45
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bug #54111 mysqltest command remove_files_wildcard does not work in embedded ...Bjorn Munch2010-06-151-0/+42
| | * | | | | Bug #53374 Don't delete temporary perl file if perl failsBjorn Munch2010-06-071-2/+3
| | * | | | | Merge from 5.1 up to rev 3392Bjorn Munch2010-06-024-18/+24
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge from mysql-trunkBjorn Munch2010-06-024-11/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ upmerge 42513,52214Bjorn Munch2010-04-131-12/+5
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Bug #52214 Misleading error msg when test fails before having produced any queryBjorn Munch2010-04-131-2/+5
| | * | | | | | | Bug #42513 mtr2: mysqltest doesn't count internal commands output as real outputBjorn Munch2010-04-131-10/+0
| * | | | | | | | merge from trunkBjorn Munch2010-04-133-4/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ upmerge 52301Bjorn Munch2010-03-311-3/+16
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Bug #52301 Add --protocol to mysqltestBjorn Munch2010-03-231-3/+16
| * | | | | | | | | merge from trunkBjorn Munch2010-03-263-12/+15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ upmerge 43603Bjorn Munch2010-03-221-8/+12
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Bug #43603 mysqltest command disable_abort_on_error does not affect all built...Bjorn Munch2010-03-221-8/+12
| * | | | | | | | | | upmerge 43588Bjorn Munch2010-03-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Bug #43588 mysqltest command disable_abort_on_error logs connect commandsBjorn Munch2010-03-171-1/+1
| | * | | | | | | | | merge from 5.1Bjorn Munch2010-03-0410-144/+171
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ merge from trunkBjorn Munch2010-03-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ merge from trunkBjorn Munch2010-03-0815-295/+634
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ merge from trunkBjorn Munch2010-03-0410-144/+171
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ upmerge 51590Bjorn Munch2010-03-031-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Bug #51590 mysqltest: --disable_abort_on_error does not work inside while/ifBjorn Munch2010-03-021-3/+4
* | | | | | | | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-292-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-202-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-202-3/+6
* | | | | | | | | | | | | | | | Bug#42733: Type-punning warnings when compiling MySQLDavi Arnaut2010-07-241-4/+3
* | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-3/+3
* | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-4/+0
* | | | | | | | | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-1/+0
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-1514-311/+152
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-4/+4
| * | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-1511-144/+9
| * | | | | | | | | | | | | | | BUG 54744: automerged bzr bundle from bug report.Luis Soares2010-07-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | BUG#54744: valgrind reports leak for mysqlbinlogLuis Soares2010-07-081-0/+1
| * | | | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-1/+1
| * | | | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-0812-163/+138
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Revert patch for BUG#54744.Luis Soares2010-07-081-1/+0
| * | | | | | | | | | | | | | | BUG#54744: valgrind reports leak for mysqlbinlogLuis Soares2010-07-061-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | mergeGeorgi Kodinov2010-07-141-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use UNINIT_VAR workaround instead of LINT_INIT.Davi Arnaut2010-07-091-2/+1