summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newunknown2006-05-2431-449/+208
|\
| * Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-244-1/+28
| |\
| | * Merge april.(none):/home/svoj/devel/BitKeeper/mysql-5.1-newunknown2006-05-244-1/+28
| | |\
| | | * BUG#19907 - simple_parser plugin cannot be installedunknown2006-05-191-1/+1
| | | * Merge april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0unknown2006-05-183-0/+27
| | | |\
| | | | * Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesunknown2006-05-183-0/+27
| | | | |\
| | | | | * BUG#18233 - Memory tables INDEX USING HASH (a,b) returns 1 row onunknown2006-05-103-0/+27
| * | | | | Fix missing source file.unknown2006-05-241-1/+2
| * | | | | Merge mysql.com:/usr/local/mysql/mysql-5.0-gcovunknown2006-05-241-2/+13
| |\ \ \ \ \
| | * | | | | Fix BUILD/compile-pentium-gcovunknown2006-05-221-2/+13
| * | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-2314-397/+96
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-2314-397/+96
| | |\ \ \ \ \ \
| | | * | | | | | Removing mysql_explain_log from 5.1unknown2006-05-234-397/+1
| | | * | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-2310-0/+95
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-2210-0/+95
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-1810-0/+95
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-1310-0/+95
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-1110-0/+95
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-1010-0/+95
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-099-33/+36
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-0810-0/+95
| | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | Added new show contributors command. unknown2006-05-0210-0/+95
| * | | | | | | | | | | | | | | | Fix events_logs_tests so it won't fail on Windows due to appearanceunknown2006-05-232-5/+8
| * | | | | | | | | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.1-releaseunknown2006-05-234-22/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | event_scheduler.h, event_scheduler.cc:unknown2006-05-232-5/+5
| | * | | | | | | | | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.1-releaseunknown2006-05-231-2/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | __FUNCTION__ is not available everywhere.unknown2006-05-231-2/+9
| | * | | | | | | | | | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.1-releaseunknown2006-05-232-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.1-releaseunknown2006-05-2310-18/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Bug#20002 Old --with-openssl and --with-yassl options just silently ignoredunknown2006-05-231-2/+12
| | * | | | | | | | | | | | | | | | | | Bug#20018 Class declared inside of function causes problem with gcc 2.95.3unknown2006-05-231-13/+13
| * | | | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-05-232-18/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newunknown2006-05-232-18/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.1-20004unknown2006-05-222-18/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Bug #20004: log_tables fails on Windows due to output differencesunknown2006-05-222-18/+19
| * | | | | | | | | | | | | | | | | | | | Removed wrong ascii codes from source code.unknown2006-05-233-3/+3
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newunknown2006-05-23156-4277/+10351
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge lmy004.:/work/mysql-5.1-releaseunknown2006-05-232-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | update log_tables.test so it is less fragileunknown2006-05-232-9/+9
| | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge lmy004.:/work/mysql-5.1-releaseunknown2006-05-234-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | various fixes after push of fix for bug#17619unknown2006-05-234-2/+7
| * | | | | | | | | | | | | | | | | | Merge lmy004.:/work/mysql-5.1-releaseunknown2006-05-236-16/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | update resultunknown2006-05-235-6/+13
| | * | | | | | | | | | | | | | | | | make it less stressful. some pushbuild boxes cannot cope with itunknown2006-05-232-10/+10
| | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-2374-2686/+4720
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | BUG#20015 mgmsrv and mgmapi: get statport is dead codeunknown2006-05-234-49/+0
| | * | | | | | | | | | | | | | | | | Merge lmy004.:/work/mysql-5.1-releaseunknown2006-05-231-4/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | fix endianess on ppc. seems for sys_var_long_ptr we have to fetchunknown2006-05-231-4/+5
| | * | | | | | | | | | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-233-25/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | fix win32 build after push for bug#17619unknown2006-05-233-25/+9