summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Merge bk@192.168.21.1:mysql-5.1-optunknown2006-12-0819-295/+324
|\
| * Merge mysql.com:/home/hf/work/embt/my50-embtunknown2006-11-1319-295/+324
| |\
| | * several fixes to make tests pass in embedded-server modeunknown2006-11-1323-368/+326
| | * Merge mysql.com:/home/hf/work/embt/my41-embtunknown2006-11-131-0/+2
| | |\
| | | * delayed.test fixedunknown2006-11-131-0/+2
| | | * embedded-mode tests fixedunknown2006-11-131-0/+3
* | | | Merge mysql.com:/home/hf/work/pfix/my50-pfixunknown2006-12-072-2/+2
|\ \ \ \
| * | | | merging fixunknown2006-12-072-2/+2
* | | | | mergingunknown2006-12-071-2/+2
* | | | | Merge mysql.com:/home/hf/work/22372/my50-22372unknown2006-12-073-18/+31
|\ \ \ \ \ | |/ / / /
| * | | | mergingunknown2006-12-071-16/+16
| * | | | Merge mysql.com:/home/hf/work/22372/my41-22372unknown2006-12-063-8/+21
| |\ \ \ \
| | * | | | bug #22372unknown2006-12-061-0/+1
| | * | | | bug #22372 (LOAD DATA crashes the table with the geometry field)unknown2006-12-062-2/+15
| | * | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-12-011-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-301-1/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-294-82/+106
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtimeunknown2006-11-212-81/+77
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtimeunknown2006-11-162-1/+29
| | | |\ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.1-optunknown2006-12-062-0/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bug #20835 (Subqueries: literal string with =any fails)unknown2006-12-032-0/+14
* | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0unknown2006-12-042-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-optunknown2006-12-042-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | type_varchar.result:unknown2006-12-041-0/+1
| | * | | | | | | | | | | item_func.cc:unknown2006-12-041-0/+1
| * | | | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2006-12-013-1/+20
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-012-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1unknown2006-12-0120-201/+370
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-013-1/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-018-201/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2006-12-012-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-012-1/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workunknown2006-11-301-0/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | late after-merge fixunknown2006-11-301-1/+7
| | | | * | | | | | | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workunknown2006-11-301-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2006-11-301-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|/ / / / | | | | | | |/| | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | minor fix to mtr_process.plunknown2006-11-301-1/+1
| | | | | | | |_|_|_|_|_|_|_|/ / / / | | | | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-306-200/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Don't abort if we call my_thread_end() multiple timesunknown2006-11-301-189/+0
| | | * | | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-293-1/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-293-1/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Increased heap max length to > 4G for 64 bit machines unknown2006-11-283-1/+20
| | | * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-292-10/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Added back sql-bench directory, so that one can more easily run benchmarks on...unknown2006-11-292-10/+1
| * | | | | | | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-optunknown2006-11-304-27/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-optunknown2006-11-304-27/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | func_group.test, func_group.result, func_gconcat.result, func_gconcat.test:unknown2006-11-304-27/+3
| * | | | | | | | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-optunknown2006-11-302-19/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0unknown2006-11-3012-0/+357
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | func_gconcat.result, func_gconcat.test:unknown2006-11-302-19/+2