summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Import patch from yaSSLmsvensson@shellback.(none)2006-05-315-70/+23
* Add define YASLSL_PREFIXmsvensson@shellback.(none)2006-05-312-2/+2
* Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of ...msvensson@shellback.(none)2006-05-311-0/+1
* Import from yaSSLmsvensson@shellback.(none)2006-05-312-0/+5
* Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575msvensson@shellback.(none)2006-05-3115-13/+212
|\
| * Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_initmsvensson@shellback.(none)2006-05-3115-13/+212
* | Bug#20022 mysql-test-run can't be run with secure connections turned on for a...msvensson@shellback.(none)2006-05-311-0/+3
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@shellback.(none)2006-05-314-1/+4
|\ \
| * \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint_from_5.1msvensson@shellback.(none)2006-05-294-1/+4
| |\ \
| | * | Add missing drop tablemsvensson@shellback.(none)2006-05-294-1/+4
* | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0pekka@mysql.com2006-05-3010-117/+365
|\ \ \ \
| * \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2006-05-303-30/+40
| |\ \ \ \
| | * \ \ \ Merge mysql.com:/home/alik/MySQL/devel/5.0-rtanozdrin@mysql.com2006-05-303-30/+40
| | |\ \ \ \
| | | * | | | Fix for BUG#18023: IM: instance can be started several times;anozdrin@mysql.com2006-05-291-8/+14
| | | * | | | Fix for BUG#19391: IM fails to start after two executionsanozdrin@mysql.com2006-05-291-22/+24
| | | * | | | Avoid race between master and slave.kroki@mysql.com2006-05-291-0/+2
| * | | | | | Merge mysql.com:/usr/home/ram/work/mysql-4.1ramil@mysql.com2006-05-301-0/+17
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix for bug #18351: mysqlbinlog does not set default charset?ramil@mysql.com2006-05-041-0/+17
| * | | | | | Bug#17204 "second CALL to procedure crashes Server"gluh@eagle.intranet.mysql.r18.ru2006-05-306-87/+308
* | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0pekka@mysql.com2006-05-3028-81/+501
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0pekka@mysql.com2006-05-2715-55/+369
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \