summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/data0/bk/tmp_regrburnett@bk-internal.mysql.com2006-08-172-5/+16
|\
| * Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-08-101-15/+24
| |\
| * \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-08-047-161/+213
| |\ \
| * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-08-033-3/+5
| |\ \ \
| * \ \ \ Merge bk@192.168.21.1:mysql-5.0-ktholyfoot/hf@mysql.com/deer.(none)2006-08-021-1/+1
| |\ \ \ \
| | * | | | bug #19452 (mysql_upgrade reads [client] section but doesn't handle [host] op...holyfoot@deer.(none)2006-07-031-1/+1
| * | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-07-242-4/+15
| |\ \ \ \ \
| | * | | | | bug #20950 (mysql_upgrade looks for 'mysqlcheck' not for 'mysqlcheck.exe'holyfoot/hf@mysql.com/deer.(none)2006-07-211-2/+11
| | * | | | | Merge bk-internal:/home/bk/mysql-5.0-ktjimw@rama.(none)2006-07-171-2/+4
| | |\ \ \ \ \
| | | * | | | | Bug #17485: mysql client crashes when connecting to the Instance Managerjimw@rama.(none)2006-07-111-2/+4
| | | |/ / / /
* | | | | | | Merge zim.(none):/home/brian/mysql/dep-5.0brian@zim.(none)2006-08-141-15/+24
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1cmiller@zippy.cornsilk.net2006-08-091-15/+24
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.cornsilk.net2006-08-021-15/+24
| | |\ \ \ \ \
| | | * \ \ \ \ Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-...igreenhoe/greenman@anubis.greendragongames.com2006-07-311-12/+10
| | | |\ \ \ \ \
| | | | * | | | | Fix for Bug #19364 "mysql --help gives old informations".igreenhoe/greenman@anubis.greendragongames.com2006-07-131-12/+10
| | | * | | | | | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maintiggy@rolltop.ignatz42.dyndns.org2006-07-191-3/+14
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug#20328 mysql client: dumb about trailing spaces on help command.iggy@mysql.com2006-06-291-3/+14
| | | | |/ / / / /
* | | | | | | | | Manual merge 5.0->5.1. Post-merge fixes.kostja@bodhi.local2006-08-141-9/+9
* | | | | | | | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-08-128-167/+218
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-08-031-151/+152
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove double error printout in mysqldumpmsvensson@neptunus.(none)2006-08-031-2/+0
| | * | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21215msvensson@neptunus.(none)2006-08-032-149/+155
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Bug#21215 mysqldump creating incomplete backups without warningmsvensson@neptunus.(none)2006-07-241-0/+1
| | | * | | | | | | Don't close connection to mysql before 'safe_exit', that is done in 'safe_exi...msvensson@neptunus.(none)2006-07-241-2/+0
| | | * | | | | | | Remove double printout of mysqldump in error messagemsvensson@neptunus.(none)2006-07-241-3/+2
| | | * | | | | | | Replace sock -> mysqlmsvensson@neptunus.(none)2006-07-241-91/+92
| | | * | | | | | | Change tFlag and dFlag into human readable formatmsvensson@neptunus.(none)2006-07-241-12/+14
| | | * | | | | | | Add function verbose_msgmsvensson@neptunus.(none)2006-07-241-46/+48
| * | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-08-032-2/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-022-2/+3
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2006-08-021-1/+2
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge moonbone.local:/work/tmp_merge-4.1-opt-mysqlevgen@moonbone.local2006-08-021-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | / / / | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | | * | | | | | | Merge 192.168.0.20:mysql/bug21217/my41-bug21217msvensson@neptunus.(none)2006-07-311-2/+4
| | | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-021-1/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | A fix and a test case for Bug#15752 "Lost connection to MySQL server kostja@bodhi.local2006-07-241-1/+2
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| * | | | | | | | | Merge rama.(none):/home/jimw/my/mysql-5.0-19147jimw@rama.(none)2006-08-021-2/+25
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #19147: mysqlshow INFORMATION_SCHEMA does not workjimw@rama.(none)2006-07-211-2/+25
| * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintjimw@rama.(none)2006-08-021-4/+12
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #16502: mysqlcheck gets confused with viewsjimw@rama.(none)2006-07-241-4/+12
| | |/ / / / / / / / /
| * | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-08-015-5/+25
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge 192.168.0.20:mysql/bug21217/my50-bug21217msvensson@neptunus.(none)2006-07-311-2/+2
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#21042 mysql client segfaults on importing a mysqldump exportmsvensson@neptunus.(none)2006-07-311-1/+1
| | * | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug21042msvensson@neptunus.(none)2006-07-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug#21042 mysql client segfaults on importing a mysqldump exportmsvensson@neptunus.(none)2006-07-271-1/+1
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | * | | | | | | | | | Bug#19890 mysqltest: "query" command is brokenmsvensson@neptunus.(none)2006-07-261-0/+8
| | * | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug19745msvensson@neptunus.(none)2006-07-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug#15690 mysqlimport tries to set options the server doesn't understandmsvensson@neptunus.(none)2006-07-201-1/+1
| | | |/ / / / / / / / /
| | * | | | | | | | | | Bug#10877 mysqldump should use consistent last linemsvensson@neptunus.(none)2006-07-242-1/+10
| | |/ / / / / / / / /
| | * | | | | | | | | Bug #14448: delimiter in 'prompt'cmiller@zippy.cornsilk.net2006-07-191-0/+3
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | 5.0 -> 5.1 manual merge, part 1 of 3 (or more?)tsmith@maint1.mysql.com2006-08-031-3/+14
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /