summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.cornsilk.net2006-08-177-69/+73
|\
| * manual mergeiggy@rolltop.ignatz42.dyndns.org2006-08-161-4/+21
| * Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328iggy@rolltop.ignatz42.dyndns.org2006-08-165-24/+74
| |\
| * \ Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328msvensson@shellback.(none)2006-08-164-103/+53
| |\ \
| | * | Bug#20328 mysql client: dumb about trailing spaces on 'help' commandmsvensson@shellback.(none)2006-08-164-103/+53
| * | | Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219msvensson@shellback.(none)2006-08-161-12/+17
| |\ \ \
| | * | | Bug#20219 make bin-dist produces unportable for testing tarballmsvensson@shellback.(none)2006-08-161-12/+17
| | |/ /
| * | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-08-1664-158/+766
| |\ \ \
| * \ \ \ Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-08-141-2/+2
| |\ \ \ \
| | * | | | Bug#21327 OpenSSL-checking in configuremsvensson@neptunus.(none)2006-08-141-2/+2
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.cornsilk.net2006-08-173-9/+47
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-mainttnurnberg@salvation.intern.azundris.com2006-08-101-2/+40
| |\ \ \ \ \
| | * | | | | Bug#17926: mysql.exe crashes when ctrl-c is pressed in windowstnurnberg@salvation.intern.azundris.com2006-08-101-2/+40
| | |/ / / /
| * | | | | Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-mainthartmut@mysql.com/linux.site2006-08-094-9/+227
| |\ \ \ \ \ | | |/ / / /
| | * | | | Remove extra whitespacemsvensson@neptunus.(none)2006-08-071-3/+3
| * | | | | relying on loop counter variables being local to the loop body if hartmut@mysql.com/linux.site2006-08-051-4/+4
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.cornsilk.net2006-08-171-5/+20
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Add some more code to analyze why the fgets fails.msvensson@neptunus.(none)2006-08-071-3/+12
| * | | | | Add printouts in test case for bug17667msvensson@neptunus.(none)2006-08-071-0/+4
| * | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-08-071-2/+4
| |\ \ \ \ \
| | * | | | | Change the 'sleep' into an explicit FLUSH LOGS commandmsvensson@neptunus.(none)2006-08-071-1/+3
| | * | | | | fflush(NULL) before abort so that all pending writes are performedmsvensson@neptunus.(none)2006-08-071-1/+1
* | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.cornsilk.net2006-08-173-0/+203
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | grant.result:tnurnberg@mysql.com/salvation.intern.azundris.com2006-08-071-2/+2
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-mainttnurnberg@mysql.com/salvation.intern.azundris.com2006-08-072-0/+202
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged...tnurnberg@mysql.com/salvation.intern.azundris.com2006-08-032-0/+198
| * | | | | | Flush stderr before calling abort()msvensson@neptunus.(none)2006-08-061-0/+1
* | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_mergecmiller@zippy.cornsilk.net2006-08-176-5/+27
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-08-061-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Send output from mysql_client_test to var/log/mysql_client_test.logmsvensson@neptunus.(none)2006-08-061-2/+2
| * | | | | | Bug #20968: incorrect DBUG_ENTER string in mysqld.cc network_init(void) functioniggy@rolltop.ignatz42.dyndns.org2006-08-031-1/+1
| |/ / / / /
| * | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-08-033-1/+19
| |\ \ \ \ \
| | * \ \ \ \ Merge rama.(none):/home/jimw/my/mysql-5.0-10668jimw@rama.(none)2006-08-033-1/+19
| | |\ \ \ \ \
| | | * | | | | Bug #10668: CREATE USER does not enforce username length limitjimw@rama.(none)2006-07-243-1/+19
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-08-031-1/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#20190 Unixware 7.13 port and make test errorsmsvensson@neptunus.(none)2006-08-031-1/+5
| | |/ / / / / /
* | | | | | | | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328iggy@rolltop.ignatz42.dyndns.org2006-08-167-57/+74
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Bug#20328 - Correction to test/result for broken Windows build.iggy@rolltop.ignatz42.dyndns.org2006-08-162-47/+3
| * | | | | | | Bug#19844: time_format in Union truncates valuestnurnberg@salvation.intern.azundris.com2006-08-103-3/+44
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-mainttsmith/tim@siva.hindu.god2006-08-022-16/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Bug #20402: DROP USER failure logged as ERROR rather than WARNINGtsmith/tim@siva.hindu.god2006-07-262-16/+1
* | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-08-161-2/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | small fix to enable the test suite to find executables and scripts on Windowsreggie@big_geek.2006-08-161-2/+16
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-08-169-26/+139
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil/rkalimullin@production.mysql.com2006-08-162-0/+30
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql.com:/usr/home/ram/work/tmp_mergeramil/ram@mysql.com/myoffice.izhnet.ru2006-08-152-0/+30
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix for bug #20709: Collation not used in group by on 4.1. ramil/ram@mysql.com/myoffice.izhnet.ru2006-08-103-1/+31
| | | * | | | | | | | Removed iggy's accidentally checked-in test files.cmiller@zippy.cornsilk.net2006-08-092-53/+0
| | | * | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1svoj@may.pils.ru2006-08-091-1/+11
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold/marty@mysql.com/linux.site2006-08-152-2/+2
| |\ \ \ \ \ \ \ \ \ \ \