summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Mergekent@mysql.com2006-05-290-0/+0
|\
| * configure.in:kent@mysql.com2006-05-241-1/+1
| * configure.in:kent@mysql.com2006-05-241-1/+1
* | Merge bk-internal:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-05-297-8/+54
|\ \
| * \ Merge 192.168.0.20:mysql/yassl_import/my50-yassl_importmsvensson@neptunus.(none)2006-05-297-8/+54
| |\ \
| | * | Add new file md4.cpp to VC++ project filemsvensson@shellback.(none)2006-05-291-0/+24
| | * | Import from yaSSL msvensson@shellback.(none)2006-05-296-8/+30
* | | | Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/mysql-5.0msvensson@devsrv-b.mysql.com2006-05-2920-34/+362
|\ \ \ \ | |/ / /
| * | | Merge 192.168.0.20:mysql/mysql-5.0msvensson@neptunus.(none)2006-05-2920-34/+362
| |\ \ \
| | * \ \ Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_importmsvensson@shellback.(none)2006-05-2920-34/+362
| | |\ \ \ | | | |/ /
| | | * | Import from yaSSLmsvensson@shellback.(none)2006-05-2220-34/+362
| * | | | Merge bk-internal:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-05-291-1/+2
| |\ \ \ \ | | |/ / /
* | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@devsrv-b.mysql.com2006-05-291-1/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | after merge fix.ramil@mysql.com2006-05-291-1/+2
* | | | Update result file after mergemsvensson@neptunus.(none)2006-05-291-1/+1
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-05-294-1/+13
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge neptunus.(none):/home/msvensson/mysql/bug15328/my41-bug15328msvensson@neptunus.(none)2006-05-246-2/+23
| |\ \
| | * | Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequencemsvensson@neptunus.(none)2006-05-116-2/+25
| * | | Merge bk-internal:/home/bk/mysql-4.1msvensson@neptunus.(none)2006-05-231-1/+14
| |\ \ \
| | * \ \ Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711msvensson@neptunus.(none)2006-05-231-1/+14
| | |\ \ \
* | | | | | manual mergeramil@mysql.com2006-05-293-43/+76
* | | | | | Merge mysql.com:/usr/home/ram/work/mysql-4.1ramil@mysql.com2006-05-290-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2006-05-223-35/+68
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix for bug #18536: mysqldump does not maintain table orders as per --tables ...ramil@mysql.com2006-05-193-35/+68
| * | | | | Merge bk@192.168.21.1:mysql-4.1holyfoot@mysql.com2006-05-2133-95/+462
| |\ \ \ \ \
* | \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0elliot@mysql.com2006-05-261-1/+2
|\ \ \ \ \ \ \
| * | | | | | | BUG#19322 Added help defintion for --skip-external locking to mysqld --help -...iggy@mysql.com2006-05-191-1/+2
* | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0gkodinov@mysql.com2006-05-2614-54/+367
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/home/kgeorge/mysql/5.0/cleangkodinov@mysql.com2006-05-2614-52/+324
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge mysql.com:/home/kgeorge/mysql/5.0/cleangkodinov@mysql.com2006-05-2614-52/+324
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | BUG#18681: View privileges are brokengkodinov@mysql.com2006-05-2614-52/+324
| * | | | | | | | | | Merge mysql.com:/home/kgeorge/mysql/5.0/cleangkodinov@mysql.com2006-05-264-2/+43
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Bug #14875: Bad view DEFINER makes SHOW CREATE VIEW failgkodinov@mysql.com2006-05-264-2/+43
* | | | | | | | | | | ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ]pekka@mysql.com2006-05-251-1/+3
* | | | | | | | | | | Merge mysql.com:/space/pekka/ndb/version/my50pekka@mysql.com2006-05-2512-193/+291
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/space/pekka/ndb/version/my50pekka@mysql.com2006-05-2512-193/+291
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | ndb - bug#14509 [related] re-do auto-incr error handlingpekka@mysql.com2006-05-176-105/+145
| | * | | | | | | | | | ndb - bug#14509 [related] fix a return valuepekka@mysql.com2006-05-161-2/+2
| | * | | | | | | | | | ndb - bug#14509 [related] setAutoIncrement: add error handlingpekka@mysql.com2006-05-165-40/+36
| | * | | | | | | | | | ndb - bug#14509 (5.0) part 2: create SYSTAB_0 row on first usepekka@mysql.com2006-05-112-13/+30
| | * | | | | | | | | | ndb - bug#14509, part 1: move autoincr pre-fetch from Ndb to local dict cachepekka@mysql.com2006-05-088-91/+136
* | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0gkodinov@mysql.com2006-05-258-93/+217
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kgeorge/mysql/5.0/cleangkodinov@mysql.com2006-05-254-93/+172
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kgeorge/mysql/5.0/cleangkodinov@mysql.com2006-05-254-93/+172
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Bug #18742: Test 'group_min_max' fails if "classic" configuration in 5.0gkodinov@mysql.com2006-05-234-93/+172
| * | | | | | | | | | | | | Merge mysql.com:/home/kgeorge/mysql/5.0/cleangkodinov@mysql.com2006-05-254-0/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Bug #19700: subselect returning BIGINT always returned it as SIGNEDgkodinov@mysql.com2006-05-254-0/+45
* | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2006-05-248-14/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge monty@192.168.0.9:/my/mysql-5.0monty@mysql.com2006-05-248-14/+142
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | More DBUG statementsmonty@mysql.com2006-05-248-14/+142