summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Mergeunknown2005-02-092-20/+130
|\
| * WL#964unknown2005-02-024-32/+69
| * Merge mysql.com:/home/wax/mysql/mysql-4.1unknown2005-02-0132-76/+458
| |\
| * \ Merge mysql.com:/home/wax/mysql/mysql-4.1unknown2005-01-316-161/+370
| |\ \
| | * | WL#964unknown2005-01-316-161/+370
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-092-11/+12
|\ \ \ \
| * | | | Fix so that master and master1 does not write to same .trace fileunknown2005-02-091-2/+6
| * | | | Fix core dump in ha_ndbcluster::print_resultsunknown2005-02-091-9/+6
* | | | | Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-094-148/+308
|\ \ \ \ \
| * \ \ \ \ Merge mysql.com:/home/wax/mysql/mysql-5.0unknown2005-02-094-148/+308
| |\ \ \ \ \
| | * | | | | mergeunknown2005-02-094-148/+308
* | | | | | | Mergeunknown2005-02-091-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Removed old filesunknown2005-02-092-0/+393
* | | | | | | gone:unknown2005-02-091-0/+393
* | | | | | | clean up goneunknown2005-02-091-13/+0
|/ / / / / /
* | | | | | Merge serg.mylan:/usr/home/serg/Abk/m50-brokenunknown2005-02-091-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-02-0218-81/+421
| |\ \ \ \ \
| * \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2005-02-0124-40/+348
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2005-01-311-1/+0
| |\ \ \ \ \ \ \
| | * | | | | | | unused variable removedunknown2005-01-301-1/+0
* | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-092-9/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix for NCHAR bug appeared during the mergingunknown2005-02-092-1/+2
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-091-87/+87
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated style after reviewunknown2005-02-091-87/+87
* | | | | | | | | | fixed C++ syntax in C codeunknown2005-02-093-5/+7
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-09104-1706/+9107
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Precision Math implementationunknown2005-02-09104-1706/+9107
* | | | | | | | | | WL#2130: Table locking for stored FUNCTIONsunknown2005-02-0826-340/+838
|/ / / / / / / / /
* | | | | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-081-42/+34
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-071-42/+34
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and unknown2005-02-071-42/+34
* | | | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-083-5/+12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | ndb - workaround to strnxfrm 5.0 problemunknown2005-02-083-5/+12
* | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2005-02-081-40/+112
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ndbcluster now runs clean in 4.1, 5.0 may still need some workunknown2005-02-081-40/+112
* | | | | | | | | | | | Merge mysql.com:/home/my/mysql-4.1 into mysql.com:/home/my/mysql-5.0unknown2005-02-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-072-6/+18
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-085-22/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-5.0-7931unknown2005-02-071-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add --help to mysqld_safe. (Bug #7931)unknown2005-02-021-0/+26
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-6368unknown2005-02-073-1/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Handle backslashes correctly in strings that also have doubled quotes whenunknown2005-02-033-1/+26
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-7856unknown2005-02-071-21/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Restore behavior of 4.1 that allowed any one argument to be passed to theunknown2005-01-281-21/+16
* | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-072-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Mergeunknown2005-02-072-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | mysql-test-run.sh:unknown2005-02-071-5/+6
| | * | | | | | | | | | | | | have test suite continue even if ndbcluster fails to start if --force flag is...unknown2005-02-072-1/+12
* | | | | | | | | | | | | | | Merge with 4.1 to get bug fixunknown2005-02-078-27/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-078-27/+124
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |