summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/mydev/mysql-4.0-bug5390unknown2006-01-234-79/+200
|\
| * BUG#5390 - problems with merge tablesunknown2006-01-234-73/+200
* | Merge mysql.com:/home/mydev/mysql-4.0-bug5390unknown2006-01-230-0/+0
|\ \ | |/
| * Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2006-01-171-1/+2
| |\
* | \ Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-233-0/+17
|\ \ \
| * \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-233-0/+17
| |\ \ \
| | * | | BUG#16489 - utf8 + fulltext leads to corrupt index file.unknown2006-01-233-0/+17
| * | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2006-01-230-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge bk-internal:/home/bk/mysql-4.1unknown2006-01-180-0/+0
| | |\ \ \
| | | * \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2006-01-181-7/+5
| | | |\ \ \
* | | | \ \ \ Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-233-2/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | date_formats.test:unknown2006-01-163-2/+5
| * | | | | | item_timefunc.cc:unknown2006-01-141-1/+0
| * | | | | | item_timefunc.cc:unknown2006-01-141-1/+2
| * | | | | | fix for bug#15828unknown2006-01-133-1/+14
* | | | | | | Merge hf@192.168.21.12:work/mysql-4.1.15429unknown2006-01-211-0/+2
|\ \ \ \ \ \ \
| * | | | | | | bug #15429 (Test 'func_math' not prepared for 'classic' build)unknown2005-12-191-0/+2
* | | | | | | | Merge hf@192.168.21.12:work/mysql-4.1.14320unknown2006-01-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix for bug #14320 (MBROverlaps does wrong test)unknown2005-12-101-1/+1
* | | | | | | | | Merge hf@192.168.21.12:work/mysql-4.1.9855unknown2006-01-21346-4266/+5823
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reintroduce --no-defaults to ndb_mgmdunknown2006-01-201-1/+1
| * | | | | | | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-192-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | small typo fixesunknown2006-01-192-2/+2
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | A fix and a test case for Bug#15613 "libmysqlclient API functionunknown2006-01-182-2/+81
| |/ / / / / / / /
| * | | | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainunknown2006-01-187-11/+79
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG#11331 "Warning: could not add log destination" message does not provide e...unknown2006-01-137-11/+79
| * | | | | | | | | Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-176-3/+34
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":unknown2006-01-172-1/+21
| | * | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-184-2/+13
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | BUG#3074: Unversioned symbols in shared libraryunknown2006-01-174-2/+13
| * | | | | | | | | | | Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug14634/my41-...unknown2006-01-171-7/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | / / / | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | Bug #14634 Running out of diskspace on tmpdir returns an inappropriate errorunknown2006-01-171-7/+5
| * | | | | | | | | | Increase the version number to 4.1.18unknown2006-01-171-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-1714-49/+320
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-174-32/+33
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | A fix for Bug#13337 "ps test fails if configure wo/ usc2"unknown2006-01-174-32/+33
| | * | | | | | | | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2006-01-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | / | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Merge bk-internal:/home/bk/mysql-4.0unknown2006-01-161-1/+2
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Mergeunknown2006-01-163-0/+13
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-203-0/+13
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | fix for bug#12913unknown2005-09-013-0/+13
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554unknown2006-01-160-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | BUG#6554 Problem Building MySql on Fedora Core 3unknown2006-01-161-1/+2
| | * | | | | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-01-155-17/+203
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Changes from innodb-4.1-ss14 snapshotunknown2006-01-155-17/+203
| | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | A fix and a test case for Bug#12734 " prepared statement may unknown2006-01-144-0/+71
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1unknown2006-01-132-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | extra/comp_err.c + scripts/mysqld_multi.sh :unknown2006-01-132-4/+3
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1unknown2006-01-1339-175/+778
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |