summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge serg.mylan:/usr/home/serg/Abk/m50-brokenserg@serg.mylan2005-02-091-1/+0
|\
| * Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-02-0218-81/+421
| |\
| * \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-02-0124-40/+348
| |\ \
| * \ \ Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-01-311-1/+0
| |\ \ \
| | * | | unused variable removedserg@serg.mylan2005-01-301-1/+0
* | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0hf@deer.(none)2005-02-092-9/+9
|\ \ \ \ \
| * | | | | Fix for NCHAR bug appeared during the merginghf@deer.(none)2005-02-092-1/+2
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.homeip.net2005-02-091-87/+87
|\ \ \ \ \ \
| * | | | | | Updated style after reviewmsvensson@neptunus.homeip.net2005-02-091-87/+87
* | | | | | | fixed C++ syntax in C codebell@sanja.is.com.ua2005-02-093-5/+7
| |/ / / / / |/| | | | |
* | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0hf@deer.(none)2005-02-09104-1706/+9107
|\ \ \ \ \ \
| * | | | | | Precision Math implementationhf@deer.(none)2005-02-09104-1706/+9107
* | | | | | | WL#2130: Table locking for stored FUNCTIONspem@mysql.comhem.se2005-02-0826-340/+838
|/ / / / / /
* | | | | | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0jan@hundin.mysql.fi2005-02-081-42/+34
|\ \ \ \ \ \
| * \ \ \ \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0jan@hundin.mysql.fi2005-02-071-42/+34
| |\ \ \ \ \ \
| | * | | | | | Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and jan@hundin.mysql.fi2005-02-071-42/+34
* | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0pekka@mysql.com2005-02-083-5/+12
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | ndb - workaround to strnxfrm 5.0 problempekka@mysql.com2005-02-083-5/+12
* | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1tomas@poseidon.ndb.mysql.com2005-02-081-40/+112
|\ \ \ \ \ \ \ \
| * | | | | | | | ndbcluster now runs clean in 4.1, 5.0 may still need some worktomas@poseidon.ndb.mysql.com2005-02-081-40/+112
* | | | | | | | | Merge mysql.com:/home/my/mysql-4.1 into mysql.com:/home/my/mysql-5.0monty@mysql.com2005-02-080-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-02-072-6/+18
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-02-085-22/+68
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-5.0-7931jimw@mysql.com2005-02-071-0/+26
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add --help to mysqld_safe. (Bug #7931)jimw@mysql.com2005-02-021-0/+26
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-6368jimw@mysql.com2005-02-073-1/+26
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Handle backslashes correctly in strings that also have doubled quotes whenjimw@mysql.com2005-02-033-1/+26
| | |/ / / / / / / / /
| * | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-7856jimw@mysql.com2005-02-071-21/+16
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Restore behavior of 4.1 that allowed any one argument to be passed to thejimw@mysql.com2005-01-281-21/+16
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-02-072-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Mergetomas@poseidon.ndb.mysql.com2005-02-072-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | mysql-test-run.sh:tomas@poseidon.ndb.mysql.com2005-02-071-5/+6
| | * | | | | | | | | | have test suite continue even if ndbcluster fails to start if --force flag is...tomas@poseidon.ndb.mysql.com2005-02-072-1/+12
* | | | | | | | | | | | Merge with 4.1 to get bug fixmonty@mysql.com2005-02-078-27/+123
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-02-078-27/+124
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fixed bug in HAVING when refering to RAND() through aliasmonty@mysql.com2005-02-078-27/+124
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-02-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Added commentmonty@mysql.com2005-02-071-0/+4
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0acurtis@pcgem.rdg.cyberkinetica.com2005-02-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Ensure that slaves have normal COMMIT behaviour after WL#1967acurtis@pcgem.rdg.cyberkinetica.com2005-02-071-0/+1
* | | | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1tomas@poseidon.ndb.mysql.com2005-02-071-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-02-071-8/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | mysql.spec.sh:tomas@poseidon.ndb.mysql.com2005-02-071-8/+7
* | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.homeip.net2005-02-072-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Small changes after Tomas reviewmsvensson@neptunus.homeip.net2005-02-072-1/+2
* | | | | | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perlkent@mysql.com2005-02-071-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | / / / / / / / / / / / | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | compile-solaris-sparc-purify:kent@mysql.com2005-02-071-4/+4
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-02-076-31/+219
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2005-02-071-5/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2005-02-071-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status