summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* More changes to reflect the removal of manual.texi from the sources:lenz@mysql.com2005-04-133-7/+5
* Manual merge of the ChangeSet to remove the dependency on manual.texi from th...lenz@mysql.com2005-04-1352-11005/+391
|\
| * - manual.texi will be replaced with a manual written in DocBook/XML. This Cha...lenz@mysql.com2005-04-13443-55842/+392
* | In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at endgbichot@quadita2.mysql.com2005-04-112-2/+1
* | Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1gbichot@quadita2.mysql.com2005-04-111-0/+2
|\ \
| * | Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in...gbichot@quadita2.mysql.com2005-04-111-0/+2
* | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@mdk10.(none)2005-04-1110-5/+47
|\ \ \ | |/ /
| * | Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER()dlenev@brandersnatch.localdomain2005-04-111-1/+1
| * | Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796dlenev@mysql.com2005-04-113-0/+4
| |\ \ | | |/
| | * Fix for bug #9796 "Query Cache caches queries with CURRENT_USER()dlenev@mysql.com2005-04-113-0/+4
| * | ctype_collate.result, ctype_collate.test, union.result, union.test:bar@mysql.com2005-04-105-3/+37
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1acurtis@xiphis.org2005-04-092-2/+6
| |\ \
| | * | Fix typos in Bug#6776acurtis@xiphis.org2005-04-091-2/+2
| | * | Merge xiphis.org:/var/db/bk/work-acurtis/bug6776acurtis@xiphis.org2005-04-082-2/+6
| | |\ \
| | | * | Bug#6776acurtis@pcgem.rdg.cyberkinetica.com2005-03-071-2/+5
* | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@mdk10.(none)2005-04-084-0/+33
|\ \ \ \ \ | |/ / / /
| * | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1marko@hundin.mysql.fi2005-04-084-0/+33
| |\ \ \ \
| | * | | | InnoDB: Prevent ALTER TABLE ... ENGINE=...marko@hundin.mysql.fi2005-04-074-0/+33
* | | | | | Bug #9665 After registering MySQL service and starting with shared mem, cann...reggie@mdk10.(none)2005-04-081-9/+0
* | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1reggie@mdk10.(none)2005-04-088-17/+156
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2005-04-084-13/+29
| |\ \ \ \ \
| | * \ \ \ \ Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11joerg@mysql.com2005-04-084-13/+29
| | |\ \ \ \ \
| | | * | | | | Add missing parts for the "Cybozu" custom build, to avoid future manual patches.joerg@mysql.com2005-04-084-13/+29
| * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-04-082-4/+95
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | bug#9749 - ndb joreland@mysql.com2005-04-081-0/+93
| | * | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-03-291-4/+2
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-03-231-4/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | ndb -joreland@mysql.com2005-03-201-4/+2
| * | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-04-082-0/+32
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Added more tests for auto_incrementmskold@mysql.com2005-04-082-0/+32
* | | | | | | | | | | Bug #9665 After registering MySQL service and starting with shared mem, canno...reggie@mdk10.(none)2005-04-081-0/+12
|/ / / / / / / / / /
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-04-0721-72/+352
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB stor...mskold@mysql.com2005-04-071-1/+4
| * | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-04-074-15/+83
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storagemskold@mysql.com2005-04-074-15/+83
| * | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-072-12/+161
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Post-review fixes: local variable renamedsergefp@mysql.com2005-04-071-5/+5
| | * | | | | | | | Removed extra commentsergefp@mysql.com2005-04-051-1/+0
| | * | | | | | | | Fix for BUG#8877: Implementation of sergefp@mysql.com2005-04-052-12/+162
| * | | | | | | | | Added missing DBUG_RETURNsmskold@mysql.com2005-04-071-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.0-cleanjimw@mysql.com2005-04-061-1/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.0-9492jimw@mysql.com2005-04-061-1/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix segmentation fault in mysqlcheck when the last tablejimw@mysql.com2005-03-311-1/+2
| | * | | | | | | | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2005-04-051-0/+3
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | A fix for Netware.jani@ua141d10.elisa.omakaista.fi2005-04-051-1/+1
| * | | | | | | | | | InnoDB: Avoid test suite failures caused by a locking conflictmarko@hundin.mysql.fi2005-04-063-4/+30
| * | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-04-064-6/+14
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Makefile.am:kent@mysql.com2005-04-064-6/+14
| * | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@mysql.com2005-04-062-5/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Minor clean-ups for the previous commit.bar@mysql.com2005-04-062-5/+5