summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed failing test rpl_ndb_auto_inc.testunknown2006-06-293-2/+5
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-06-2910-5/+41
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-06-2810-5/+41
| |\
| | * Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to ...unknown2006-06-282-1/+3
| | * Added purecov comment for new, not executed code for my recent changesetunknown2006-06-288-4/+38
* | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-06-283-6/+26
|\ \ \
| * \ \ Merge xiphis.org:/home/antony/work2/p4-bug12096.3unknown2006-06-283-6/+26
| |\ \ \ | | |/ / | |/| |
| | * | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2006-06-220-0/+0
| | |\ \
| | | * \ Merge bk-internal.mysql.com:/data0/bk/tmp-5.1unknown2006-06-2220-111/+243
| | | |\ \
| | * | \ \ Merge xiphis.org:/home/antony/work2/p4-bug12096.2unknown2006-06-223-6/+26
| | |\ \ \ \
| | | * | | | traditional grep does not have -q optionunknown2006-06-211-1/+1
| | | * | | | Merge xiphis.org:/home/antony/work2/mysql-5.0-enginesunknown2006-06-2110-33/+51
| | | |\ \ \ \
| | | * | | | | Bug#12096unknown2006-05-313-6/+26
| | | * | | | | Merge xiphis.org:/anubis/bk/mysql-5.0unknown2006-05-306-14/+116
| | | |\ \ \ \ \
* | | | \ \ \ \ \ Manual mergeunknown2006-06-2812-47/+116
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | key.result:unknown2006-06-231-2/+2
| * | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-2328-28/+1303
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge moonbone.local:/work/tmp_merge-4.1-opt-mysqlunknown2006-06-234-21/+22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#11228: DESC shows arbitrary column as "PRI"unknown2006-06-233-21/+21
| | * | | | | | | | | mysql.spec.sh:unknown2006-06-231-0/+1
| * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-225-15/+78
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-06-2218-22/+175
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Manual mergeunknown2006-06-220-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-06-223-13/+73
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fixed bug #14896.unknown2006-06-223-13/+73
| | * | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-2218-22/+175
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kgeorge/mysql/5.0/teamcleanunknown2006-06-213-9/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ merge of the changes for bug #18080unknown2006-06-213-9/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Bug #18080: INSERT ... SELECT ... JOIN results in ambiguous field list errorunknown2006-06-193-9/+14
| * | | | | | | | | | | | | | | manual mergeunknown2006-06-212-0/+67
| * | | | | | | | | | | | | | | Merge mysql.com:/home/kgeorge/mysql/5.0/teamcleanunknown2006-06-215-74/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Bug #20482: failure on Create join view with sources views/tables in different unknown2006-06-215-10/+67
| * | | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-06-2154-770/+1338
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove deadcode in select_dumpvar::send_data()unknown2006-06-211-7/+2
| * | | | | | | | | | | | | | | | wrong merge of bug9676 from 4.1 to 5.0 correctedunknown2006-06-201-1/+1
| * | | | | | | | | | | | | | | | Merge mysql.com:/home/kgeorge/mysql/4.1/B9676unknown2006-06-193-4/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-06-2850-311/+1011
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Bug #20705 table truncation from one mysqld causes ERROR 1412 on other mysqld...unknown2006-06-281-1/+24
| * | | | | | | | | | | | | | | | | corrected partition test case results that were put backunknown2006-06-283-20/+20
| * | | | | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-06-2758-382/+3617
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | partition functions to pass create_info, not only max_rowsunknown2006-06-278-37/+45
| * | | | | | | | | | | | | | | | | | changed signature of get_default_no_partitionsunknown2006-06-273-5/+9
| * | | | | | | | | | | | | | | | | | Bug #19852 Restoring backup made from cluster with full data memory failsunknown2006-06-271-3/+5
| * | | | | | | | | | | | | | | | | | Bug #19852 Restoring backup made from cluster with full data memory failsunknown2006-06-2710-62/+39
| * | | | | | | | | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-mainunknown2006-06-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Bug #19852 Restoring backup made from cluster with full data memory failsunknown2006-06-273-4/+3
| * | | | | | | | | | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-mainunknown2006-06-2732-135/+531
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Bug #19852 Restoring backup made from cluster with full data memory failsunknown2006-06-2732-140/+570
| | * | | | | | | | | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mainunknown2006-06-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-newunknown2006-06-266-19/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \