summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-051-2/+5
|\
| * Merge olga.mysql.com:/home/igor/mysql-5.1unknown2007-06-031-2/+5
| |\
| | * Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-06-011-2/+5
| | |\
| | | * Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-05-281-2/+5
| | | |\
| | | | * Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-optunknown2007-05-281-2/+5
| | | | |\
| | | | | * Fixed bug #28522:unknown2007-05-251-2/+5
* | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51unknown2007-06-0514-533/+556
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-0114-533/+541
| |\ \ \ \ \ | | |/ / / /
| | * | | | Added casts to avoid compiler warnings and fixed a wrong type.unknown2007-05-311-12/+16
| | * | | | Changed accidently added tabs back into spaces.unknown2007-05-281-1/+1
| | * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-2414-524/+528
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-1014-524/+528
| * | | | | bug#17654 --read-from-remote-server causes coreunknown2007-05-301-0/+1
| * | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-05-281-0/+14
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | BUG#17654 : --read-from-remote-server causes coreunknown2007-05-221-0/+14
* | | | | | Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maintunknown2007-06-021-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maintunknown2007-06-021-1/+1
| |\ \ \ \ \ \
| | * | | | | | Move code after variable delcarationunknown2007-06-011-1/+1
| * | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-06-011-34/+205
| |\ \ \ \ \ \ \
| * | | | | | | | mysqldump.c:unknown2007-05-311-3/+3
* | | | | | | | | Merge pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497unknown2007-06-011-34/+205
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497unknown2007-06-011-34/+205
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_valueunknown2007-06-011-34/+205
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test fail...unknown2007-06-011-34/+205
* | | | | | | | | mysqldump.c:unknown2007-05-311-3/+3
* | | | | | | | | Merge damien-katzs-computer.local:/Users/dkatz/mysql50unknown2007-05-301-4/+53
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Bug #24733 RESET MASTER run before dump with --delete-master-logsunknown2007-05-271-4/+53
| |/ / / / / /
| * | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-05-181-6/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge siva.hindu.god:/home/tsmith/m/bk/50unknown2007-05-171-7/+7
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Format corrections for various "Makefile.am": Leading tab, no trailing blank.unknown2007-05-021-7/+7
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-maintunknown2007-05-183-33/+29
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge siva.hindu.god:/home/tsmith/m/bk/51unknown2007-05-173-33/+29
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesunknown2007-05-042-26/+22
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2007-04-272-26/+22
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | wl#2936 post-merge fixesunknown2007-04-161-25/+21
| | | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-161-1/+1
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | WL#2936unknown2007-03-231-1/+1
| | * | | | | | | | | | Manual merge: Makefile lines must start with tab, not blank.unknown2007-05-021-7/+7
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/maint/50unknown2007-05-171-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-05-181-6/+12
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-05-181-6/+12
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | / / | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | WL#2247 mysqltest: add option for sorting resultsunknown2007-05-181-4/+4
| | * | | | | | | | WL#2247 mysqltest: add option for sorting resultsunknown2007-05-161-6/+12
* | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-05-161-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-05-161-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Bug#28470 mysqltest scripts need to know protocolunknown2007-05-161-0/+5
| * | | | | | | | Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o eve...unknown2007-05-161-2/+8
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Bug#27293: mysqldump crashes when dumping procedure defined by different userunknown2007-04-301-3/+10
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-04-231-0/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#24732 Executables do not include Vista manifestsunknown2007-04-231-0/+14