summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-5.0-1039jimw@mysql.com2006-05-198-21/+181
|\
| * Bug #1039: tmpdir and datadir not available via @@ system variable syntaxjimw@mysql.com2006-05-088-16/+173
* | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@devsrv-b.mysql.com2006-05-192-3/+6
|\ \
| * \ Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711msvensson@neptunus.(none)2006-05-192-3/+6
| |\ \
| | * | Bug#15869 Cannot shutdown the server - it restartsmsvensson@neptunus.(none)2006-05-192-3/+6
* | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0igor@rurik.mysql.com2006-05-183-1/+13
|\ \ \ \
| * | | | Bug #13975: "same string" + 0 has 2 different resultsjimw@mysql.com2006-05-183-1/+13
* | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2006-05-189-5/+65
|\ \ \ \ \ | |/ / / /
| * | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2006-05-189-5/+65
| |\ \ \ \
| | * | | | Fixed bug#19077: A nested materialized derived table is used before being pop...evgen@moonbone.local2006-05-189-5/+65
* | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0igor@rurik.mysql.com2006-05-177-5/+122
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed bug #19816.igor@rurik.mysql.com2006-05-173-3/+58
| * | | | | Fixed bug #19573.igor@rurik.mysql.com2006-05-164-2/+64
* | | | | | Merge mysql.com:/M50/bug19040-5.0 into mysql.com:/M50/mysql-5.0joerg@mysql.com2006-05-171-0/+4
|\ \ \ \ \ \
| * | | | | | Include "config.h" (if it exists) in all yaSSL files via their "runtime.hpp".joerg@mysql.com2006-05-171-0/+4
* | | | | | | Merge bk-internal:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-05-172-8/+11
|\ \ \ \ \ \ \
| * | | | | | | Bug#18818 configure: No longer finds OpenSSL on Mac OS Xmsvensson@neptunus.(none)2006-05-122-8/+11
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug18818/my41-bug18818msvensson@neptunus.(none)2006-05-120-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#18818 configure: No longer finds OpenSSL on Mac OS Xmsvensson@neptunus.(none)2006-05-121-9/+11
* | | | | | | | | Merge tulin@production.mysql.com:mysql-5.0tomas@poseidon.ndb.mysql.com2006-05-172-0/+9
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.ndb.mysql.com2006-05-172-0/+9
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1tomas@poseidon.ndb.mysql.com2006-05-172-0/+9
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | ndb: added some missing error codes to mgmapitomas@poseidon.ndb.mysql.com2006-05-172-0/+9
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0tulin@production.mysql.com2006-05-1618-115/+530
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | / / / / / | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1aelkin@mysql.com2006-05-164-41/+171
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP...aelkin@mysql.com2006-05-161-1/+1
| | * | | | | | | | ndb - bug#19537: arithmetic conversion Uint64 reg to Uint32 attrpekka@mysql.com2006-05-153-40/+171
| | * | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1aivanov@mysql.com2006-05-152-25/+40
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2006-05-163-29/+109
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2006-05-163-29/+109
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2006-05-163-29/+109
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | BUG#19618: post-review fixes: better commentssergefp@mysql.com2006-05-161-21/+39
| | | | * | | | | | | | | BUG#19618: Crash for unsigned_col NOT IN (-1, ... ) sergefp@mysql.com2006-05-153-18/+80
| * | | | | | | | | | | | Merge mysql.com:/opt/local/work/mysql-5.0-rootkonstantin@mysql.com2006-05-1611-54/+268
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0knielsen@mysql.com2006-05-163-13/+23
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0knielsen@mysql.com2006-05-158-41/+245
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixknielsen@mysql.com2006-05-157-20/+84
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fix two Valgrind memory leak warnings.knielsen@mysql.com2006-05-157-20/+84
| | | * | | | | | | | | | | | Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix2knielsen@mysql.com2006-05-151-21/+161
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Removed two duplicate/redundant suppressions.knielsen@mysql.com2006-05-151-21/+161
| | | | |/ / / / / / / / / / /
| * | | | | | | | | | | | | | Merge mysql.com:/opt/local/work/mysql-5.0-rootkonstantin@mysql.com2006-05-1618-175/+342
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Remove 'const' that prevents Microsoft VC realize thatkroki@mysql.com2006-05-152-2/+2
| * | | | | | | | | | | | | | Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0kroki@mysql.com2006-05-151-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix possible race. Use LOCK_grant on access to grant_version.kroki@mysql.com2006-05-151-2/+3
* | | | | | | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.ndb.mysql.com2006-05-1663-472/+1723
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | / / / / / / | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Test used a charset not available on many platformslars@mysql.com2006-05-162-10/+11
| * | | | | | | | | | | | | | Fixed result file (rpl_temporary)lars@mysql.com2006-05-161-3/+12
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge mysql.com:/users/lthalmann/bkroot/andrei-5.0lars@mysql.com2006-05-152-16/+140
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.0-rplmats@mysql.com2006-05-112-16/+140
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Bug#15886 (Test: Timing issue in test "rpl_until"):mats@mysql.com2006-05-112-16/+140