summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/51unknown2006-10-1610-124/+63
|\
| * Remove unused (and incorrect) my_lread() and my_lwrite()unknown2006-09-145-106/+3
| * Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/50unknown2006-09-147-22/+64
| |\
| | * Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/41unknown2006-09-147-22/+64
| | |\
| | | * Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/40unknown2006-09-146-14/+56
| | | |\
| | | | * Bug #4053: too many of "error 1236: 'binlog truncated in the middle of event'...unknown2006-09-146-14/+56
| | | * | Bug #4053: too many of "error 1236: 'binlog truncated in the middle of event'...unknown2006-09-141-6/+9
* | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2006-10-133-1/+24
|\ \ \ \ \
| * \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug23254/my50-bug23254unknown2006-10-133-1/+24
| |\ \ \ \ \
| | * \ \ \ \ Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254unknown2006-10-133-1/+24
| | |\ \ \ \ \
| | | * | | | | Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same ...unknown2006-10-133-1/+24
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2006-10-139-124/+193
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Additional patch for 5.1 commit for Bug#14262.unknown2006-10-123-21/+20
| * | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262unknown2006-10-119-121/+191
| |\ \ \ \ \ \ \
| | * | | | | | | The behavior of "%p" varies. We prefer "0x%lx".unknown2006-10-031-7/+7
| | * | | | | | | Bug #14262: SP: DROP PROCEDURE|VIEW (maybe more) write to binlog too late \unknown2006-10-039-108/+182
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintunknown2006-10-120-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug22728/my51-bug22728unknown2006-10-120-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug22728/my50-bug22728unknown2006-10-120-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug22728/my41-bug22728unknown2006-10-120-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix for bug #22728 "Handler_rollback value is growing".unknown2006-10-113-1/+29
* | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2006-10-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintunknown2006-10-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Add missing semicolonunknown2006-10-121-1/+1
* | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2006-10-123-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Make all compile-netware-* scripts executableunknown2006-10-123-0/+0
* | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2006-10-122-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintunknown2006-10-122-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Move the reconnect variable to beginning of functionunknown2006-10-121-3/+3
| | * | | | | | | | | | | Add win paths for mysql_client_testunknown2006-10-121-3/+4
* | | | | | | | | | | | | 5.1 should use libc-2006 by defaultunknown2006-10-121-2/+2
* | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2006-10-121-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Use libc-2003 if available else default to libcunknown2006-10-121-2/+13
* | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2006-10-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintunknown2006-10-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Look for mysql_client_test in $path_client_bindirunknown2006-10-121-1/+1
* | | | | | | | | | | | | Only one switch for ssl(--with-ssl) in 5.1unknown2006-10-122-2/+2
* | | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2006-10-122-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Switch to use yaSSL instead of OpenSSL on Netwareunknown2006-10-122-2/+2
* | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-maintunknown2006-10-124-26/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2006-10-124-26/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintunknown2006-10-124-21/+22
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Fix unhandled exception in mysql-test-run.pl, creating a dir that already existunknown2006-10-122-18/+12
| | | * | | | | | | | | | Only print cur_file->filename if cur_file->file is setunknown2006-10-121-3/+8
| | | * | | | | | | | | | Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is calledunknown2006-10-121-0/+2
| | * | | | | | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maintunknown2006-10-112-5/+15
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Fixes for embedded server testunknown2006-10-112-5/+15
* | | | | | | | | | | | | Merge polly.local:/tmp/maint/bug11655/my51-bug11655unknown2006-10-128-93/+427
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge polly.local:/tmp/maint/bug11655/my50-bug11655unknown2006-10-122-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | 5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1unknown2006-10-122-5/+7