summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Folow up on the CS patch:anozdrin/alik@ibm.2007-06-291-18/+45
* Patch for the following bugs:anozdrin/alik@ibm.2007-06-281-70/+382
* Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-workdf@pippilotta.erinye.com2007-06-161-17/+52
|\
| * BUG#27861 merge to 5.1df@pippilotta.erinye.com2007-06-151-13/+52
* | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-builddf@pippilotta.erinye.com2007-06-151-1/+11
|\ \ | |/
| * Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-06-141-1/+11
| |\
| | * Merge mysql.com:/home/hf/work/28333/my50-28333holyfoot/hf@hfmain.(none)2007-06-091-1/+11
| | |\
| | | * Bug #28333 Test "flush" tries to create a new thread - on only one platformholyfoot/hf@mysql.com/hfmain.(none)2007-06-091-1/+11
| | | * Merge bk-internal.mysql.com:/data0/bk/mysql-5.0ibabaev@bk-internal.mysql.com2007-05-281-2/+5
| | | |\
* | | | \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-builddf@pippilotta.erinye.com2007-06-111-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-builddf@pippilotta.erinye.com2007-06-061-0/+4
| |\ \ \ \
| | * | | | BUG#28860 port to 5.1df@pippilotta.erinye.com2007-06-041-0/+4
* | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-06-061-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-06-051-2/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-06-041-0/+15
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-usertomas@whalegate.ndb.mysql.com2007-06-0214-533/+541
| |\ \ \ \ \
| * | | | | | Fix comments and option description in mysqlslap.knielsen@ymer.(none)2007-05-241-2/+3
* | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@quadxeon.mysql.com2007-06-051-2/+5
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge olga.mysql.com:/home/igor/mysql-5.1igor@olga.mysql.com2007-06-031-2/+5
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1ibabaev@bk-internal.mysql.com2007-06-011-2/+5
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1ibabaev@bk-internal.mysql.com2007-05-281-2/+5
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-optgshchepa/uchum@gleb.loc2007-05-281-2/+5
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | | * | Fixed bug #28522:gshchepa/uchum@gleb.loc2007-05-251-2/+5
* | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-06-0514-533/+556
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.(none)2007-06-0114-533/+541
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Added casts to avoid compiler warnings and fixed a wrong type.jani@a88-113-38-195.elisa-laajakaista.fi2007-05-311-12/+16
| | * | | | | Changed accidently added tabs back into spaces.jani@a88-113-38-195.elisa-laajakaista.fi2007-05-281-1/+1
| | * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-2414-524/+528
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-1014-524/+528
| * | | | | | bug#17654 --read-from-remote-server causes coreaelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi2007-05-301-0/+1
| * | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2007-05-281-0/+14
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | BUG#17654 : --read-from-remote-server causes corecbell/Chuck@mysql_cab.2007-05-221-0/+14
* | | | | | | Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.(none)2007-06-021-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maintmsvensson@pilot.(none)2007-06-021-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Move code after variable delcarationmsvensson@pilot.(none)2007-06-011-1/+1
| * | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.(none)2007-06-011-34/+205
| |\ \ \ \ \ \ \ \
| * | | | | | | | | mysqldump.c:tsmith@quadxeon.mysql.com2007-05-311-3/+3
* | | | | | | | | | Merge pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497msvensson@pilot.(none)2007-06-011-34/+205
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497msvensson@pilot.(none)2007-06-011-34/+205
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_valuemsvensson@pilot.(none)2007-06-011-34/+205
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test fail...msvensson@pilot.(none)2007-06-011-34/+205
* | | | | | | | | mysqldump.c:tsmith@quadxeon.mysql.com2007-05-311-3/+3
* | | | | | | | | Merge damien-katzs-computer.local:/Users/dkatz/mysql50dkatz@damien-katzs-computer.local2007-05-301-4/+53
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Bug #24733 RESET MASTER run before dump with --delete-master-logsdkatz@damien-katzs-computer.local2007-05-271-4/+53
| |/ / / / / /
| * | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.blaudden2007-05-181-6/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge siva.hindu.god:/home/tsmith/m/bk/50tsmith@siva.hindu.god2007-05-171-7/+7
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Format corrections for various "Makefile.am": Leading tab, no trailing blank.joerg@trift2.2007-05-021-7/+7
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-maintmsvensson@pilot.blaudden2007-05-183-33/+29
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge siva.hindu.god:/home/tsmith/m/bk/51tsmith@siva.hindu.god2007-05-173-33/+29
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-05-042-26/+22
| | |\ \ \ \ \ \ \