summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-11-28308-1648/+4651
|\
| * netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain ...unknown2006-11-281-9/+9
| * Merge mysql.com:/home/kent/bk/mysql-4.1-buildunknown2006-11-280-0/+0
| |\
| | * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-2716-49/+266
| | |\
| * | \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-2733-77/+289
| |\ \ \
| | * \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2006-11-2711-22/+29
| | |\ \ \
| | | * \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releaseunknown2006-11-2711-22/+29
| | | |\ \ \
| | | | * \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2006-11-237-14/+14
| | | | |\ \ \
| | | | | * | | Many files:mysql-5.0.30unknown2006-11-237-14/+14
| | | | * | | | Add define for my_getpagesize to 8192(reworked in 5.0)unknown2006-11-231-0/+5
| | * | | | | | ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:unknown2006-11-2710-16/+16
| | * | | | | | Merge mysql.com:/home/kent/bk/mysql-4.1unknown2006-11-271-5/+5
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Makefile.am:unknown2006-11-271-5/+5
| | * | | | | | Merge mysql.com:/home/kent/bk/mysql-4.1unknown2006-11-278-29/+56
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | / / / / | | | |/ / / / | | |/| | | |
| | | * | | | gen_rec.awk:unknown2006-11-2712-42/+74
| | * | | | | mysql-test-run.pl:unknown2006-11-242-2/+5
| | * | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2006-11-241-3/+40
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | fixes for mtr_unique.plunknown2006-11-241-3/+40
| | * | | | | adaption from 4.1unknown2006-11-172-1/+126
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | MTR_BUILD_THREAD=auto selects a value for MTR_BUILD_THREAD from a pool (WL#2690)unknown2006-11-172-0/+129
| | * | | | | Merge trift2.:/MySQL/M41/push-4.1unknown2006-11-160-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge trift2.:/MySQL/M41/mysql-4.1unknown2006-11-161-2/+21
| | | |\ \ \ \
| | * | \ \ \ \ Merge trift2.:/MySQL/M50/tmp-5.0unknown2006-11-161-2/+21
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge trift2.:/MySQL/M50/bug22081-5.0unknown2006-11-161-0/+8
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge trift2.:/MySQL/M50/spec-mtr-5.0unknown2006-11-151-2/+13
| | | |\ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2006-11-27182-1021/+1157
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added option --mtr-build-thread to mysql-test-run.plunknown2006-11-232-38/+67
| | * | | | | | | | | | Added some missing DBUG_RETURNunknown2006-11-236-15/+83
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-20179-969/+1008
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Remove compiler warningsunknown2006-11-20179-969/+1008
| * | | | | | | | | | | | Fix typo in commentunknown2006-11-211-1/+1
| * | | | | | | | | | | | Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crashunknown2006-11-213-0/+31
| * | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/mysql-4.1-mrgunknown2006-11-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | ABI fixunknown2006-11-171-1/+0
| * | | | | | | | | | | | | mergingunknown2006-11-171-7/+7
| * | | | | | | | | | | | | mergingunknown2006-11-171-1/+1
| * | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optunknown2006-11-1757-287/+1852
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Bug#20045: Server crash on INSERT ... SELECT ... FROM non-mergeable view unknown2006-11-143-0/+81
| | * | | | | | | | | | | | merge 4.1->5.0 of the test suite for bug 19216 unknown2006-11-131-0/+18
| | * | | | | | | | | | | | Merge macbook.gmz:/Users/kgeorge/mysql/work/B19216-4.1-optunknown2006-11-133-9/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-094-2/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Bug #20191: getTableName gives wrong or inconsistent result when using VIEWsunknown2006-11-094-2/+66
| | * | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optunknown2006-11-0910-15/+147
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-4.1-optunknown2006-11-081-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-081-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | BUG#24056: Crash in subquery:unknown2006-11-081-1/+3
| | | * | | | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-071-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-11-071-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | bug fixedunknown2006-11-071-1/+1