summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* - after merge fix: removed pack_isam from the RPM spec file list againlenz@mysql.com2005-10-281-2/+0
* - added man page for the mysqlmanager in the RPM spec file listlenz@mysql.com2005-10-281-0/+1
* - after merge fixeslenz@mysql.com2005-10-2821-2027/+34
|\
| * - fixed RPM spec file list after merge, removed dupeslenz@mysql.com2005-10-281-7/+2
| * Merge mysql.com:/data0/mysqldev/lenz/mysql-4.0lenz@mysql.com2005-10-275-479/+0
| |\
| | * - cleanup: removed the empty NEW-RPMS directory and all referencesmysqldev@mysql.com2005-10-275-479/+0
| * | - after merge fixeslenz@mysql.com2005-10-2718-1794/+32
| |\ \ | | |/
| | * - Removed obsolete and outdated man page files from the manlenz@mysql.com2005-10-2718-1799/+32
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2005-10-281-1/+1
|\ \ \
| * | | Makefile.am:kent@mysql.com2005-10-281-1/+1
* | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2005-10-2875-924/+893
|\ \ \ \ | |/ / / |/| | |
| * | | Merge 4.1 - 5.0jani@ua141d10.elisa.omakaista.fi2005-10-287-320/+49
| * | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2005-10-2774-923/+1163
| |\ \ \ | | |/ /
| | * | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-10-274-1/+19
| | |\ \
| | | * | select.result:evgen@moonbone.local2005-10-271-8/+8
| | | * | Manually mergedevgen@moonbone.local2005-10-274-1/+19
| | | |\ \ | | | | |/
| | | | * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0kent@mysql.com2005-10-252-1/+5
| | | | |\
| | | | | * Imported fixes from 4.1 and 5.0 to 4.0.jani@ua141d10.elisa.omakaista.fi2005-10-252-1/+5
| | | | * | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-threadkent@mysql.com2005-10-252-9/+25
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | * | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0evgen@moonbone.local2005-10-143-0/+18
| | | | |\ \
| | | | | * | Fix bug #13855 select distinct with group by caused server crashevgen@moonbone.local2005-10-143-0/+18
| | | | * | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0lenz@mysql.com2005-10-131-4/+11
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | * | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1aivanov@mysql.com2005-10-2733-654/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Removed innobase/my_cnf, innobase/include/makefilewin.i,aivanov@mysql.com2005-10-2633-654/+1
| | * | | | | conf_to_src.c:bar@mysql.com2005-10-271-2/+11
| | * | | | | conf_to_src.c:bar@mysql.com2005-10-271-26/+40
| | * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-10-273-34/+120
| | |\ \ \ \ \
| | | * | | | | Bug#13347: empty result from query with like and cp1250 charsetbar@mysql.com2005-10-253-34/+120
| | * | | | | | Imported fix from 5.0.jani@a193-229-222-105.elisa-laajakaista.fi2005-10-261-1/+1
| | | |/ / / / | | |/| | | |
| | * | | | | mysql-test-run.pl:kent@mysql.com2005-10-261-3/+29
| | * | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-10-2511-10/+85
| | |\ \ \ \ \
| | | * \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-12925jimw@mysql.com2005-10-253-5/+24
| | | |\ \ \ \ \
| | | | * | | | | Fix incorrect casts in my_getopt code that capped the maximum of longlongjimw@mysql.com2005-10-253-5/+24
| | | * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-10-253-0/+26
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix bug #14016 date_format() 2nd parameter was compared using case insensitive evgen@moonbone.local2005-10-253-0/+26
| | | * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-10-253-0/+27
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATEevgen@moonbone.local2005-10-253-0/+27
| | | | |/ / / / / /
| | | * | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2005-10-250-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2005-10-130-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2005-10-130-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Merge mysql.com:/M41/clone-4.1-current into mysql.com:/M41/mysql-4.1joerg@mysql.com2005-10-1310-28/+2464
| | | | | | |\ \ \ \ \ \
| | | * | | | \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2005-10-252-5/+8
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Changed some dbug print options.jani@ua141d10.elisa.omakaista.fi2005-10-252-5/+8
| | * | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-threadkent@mysql.com2005-10-252-17/+29
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | / | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Added more tests for new UPDATE ... ORDER BY ... LIMIT optimizationmonty@mysql.com2005-10-2515-181/+169
| | * | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-10-2312-38/+404
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | BUG#9622: post-review-fixes: better commentssergefp@mysql.com2005-10-233-30/+52
| | | * | | | | | | | | | BUG#9622, stage 2, work together with fix for BUG#12232:sergefp@mysql.com2005-10-2112-31/+375
* | | | | | | | | | | | | Add DROP TABLE before trying to create view (in mysqldump)monty@mysql.com2005-10-2710-25/+32
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-10-276-23/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
View Lorry Controller Status