summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-5.1-14809unknown2005-12-161-1/+1
|\
| * Avoid setting DB_NOOVERWRITE flag on hidden primary keys in tablesunknown2005-11-091-1/+1
* | Merge mysql.com:/M51/try-5.1-extra into mysql.com:/M51/mysql-5.1unknown2005-12-161-0/+52
|\ \
| * | storage/innobase/Makefile.am :unknown2005-12-161-0/+52
* | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-1516-26/+171
|\ \ \
| * \ \ Merge bk@192.168.21.1:mysql-5.1-newunknown2005-12-151-2/+2
| |\ \ \ | | |/ /
| * | | tests fixed as we implement informative error messageunknown2005-12-154-20/+20
| * | | Merge bk@192.168.21.1:mysql-5.1-newunknown2005-12-1512-6/+151
| |\ \ \
| | * | | bug #15524 (partitioning range/list violation error message is insufficient)unknown2005-12-155-3/+23
| | * | | bug #15521 (Cannot reorganise a partition with a new name equal to the old name)unknown2005-12-157-3/+128
* | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-releaseunknown2005-12-1510-9/+17
|\ \ \ \ \
| * | | | | Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure o...unknown2005-12-145-5/+7
| * | | | | Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictableunknown2005-12-142-0/+2
| * | | | | bug#15682 - ndbunknown2005-12-143-2/+46
| * | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2005-12-131-0/+5
| |\ \ \ \ \
| | * | | | | Fix for bug#15209: MySQL installation problem on Windows ME.unknown2005-12-131-0/+5
| * | | | | | BUG#15624: Use --real_sleep in rpl_deadlock.test to avoid breaking when run w...unknown2005-12-131-3/+3
* | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-153-6/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1unknown2005-12-151-2/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge joerg@trift2:/M50/part3-kent-joergunknown2005-12-152-5/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2005-12-131-2/+2
| | | |\ \ \ \
| | | | * | | | my_pthread.h:unknown2005-12-131-2/+2
| | | * | | | | Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-releaseunknown2005-12-122-4/+4
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-releaseunknown2005-12-122-4/+4
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | | * | | Merge mysql.com:/M50/bug12429 into mysql.com:/M50/clone-5.0unknown2005-12-122-4/+4
| | | | | |\ \ \
| * | | | | \ \ \ Merge mysql.com:/usr/local/mysql/mysql-5.0-mergeunknown2005-12-151-3/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | skip_name_resolve.result, skip_name_resolve.test:unknown2005-12-123-6/+3
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2005-12-151-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge mysql.com:/usr/local/mysql/mysql-mawkunknown2005-12-141-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | BUG#15734: Fix undefined awk behaviour breaking compilation on Debian.unknown2005-12-141-1/+1
| | * | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2005-12-141-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Merge mysql.com:/usr/local/mysql/mysql-5.0-XOPEN_SOURCEunknown2005-12-081-1/+1
| | | |\ \ \ \ \ \
* | | | \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-1521-244/+145
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Makefile.am:unknown2005-12-151-1/+1
| * | | | | | | | | Makefile.am:unknown2005-12-151-0/+2
| * | | | | | | | | Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-151-1/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | * made the following changes for the generic 5.1 RPM spec fileunknown2005-12-121-5/+24
| * | | | | | | | | | Merge joerg@trift2:/M50/part2-ramilunknown2005-12-143-5/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Fix for bug #15630: Test case failure in sp-dynamic, sp-error, and sp.unknown2005-12-121-1/+1
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2005-12-122-4/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix for bug #15605: 5.0.17 test case 'mysqltest' failure.unknown2005-12-091-2/+2
| | | * | | | | | | | Fix for bug #15602: 5.0.17 test case 'create' failure.unknown2005-12-091-2/+1
| * | | | | | | | | | Merge trift-lap.fambruehe:/MySQL/M51/part1-kent-knielsenunknown2005-12-142-4/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1unknown2005-12-111-2/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2005-12-092-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | trigger-grant.test, trigger-compat.test:unknown2005-12-092-2/+2
| | * | | | | | | | | | | Attempt to fix rpl_relayrotate.test for host openbsd, fix suggested by Guilhemunknown2005-12-091-3/+2
| | * | | | | | | | | | | Merge mysqldev@production:my/mysql-5.0-releaseunknown2005-12-081-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | / / / / | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1unknown2005-12-082-2/+4
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-1415-235/+137
| |\ \ \ \ \ \ \ \ \ \ \ \