summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge xiphis.org:/var/db/bk/work-acurtis/bug6776.1unknown2005-04-091-2/+5
|\
| * Fix typos in Bug#6776unknown2005-04-091-2/+2
| * Merge xiphis.org:/var/db/bk/work-acurtis/bug6776unknown2005-04-081-2/+5
| |\
| | * Bug#6776unknown2005-03-071-2/+5
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-075-44/+213
| |\ \
| * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-062-8/+10
| |\ \ \
| * \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-04-051-1/+1
| |\ \ \ \
| | * | | | Fix swedish error messageunknown2005-04-051-1/+1
| * | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-04-051-2/+28
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-04-041-2/+28
| | |\ \ \ \
* | | \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-084-7/+79
|\ \ \ \ \ \ \
| * | | | | | | Fixed BUG#9073: Able to declare two handlers for same condition in same scopeunknown2005-04-084-7/+79
* | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-081-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Mergeunknown2005-04-081-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Merge from fix of Bug #9675 Auto-increment not working with INSERT..SELECT a...unknown2005-04-081-1/+13
* | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-04-081-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed BUG#6900: Stored procedure inner handler ignoredunknown2005-04-081-4/+4
| * | | | | | | | Fixed BUG#7299: Stored procedures: exception handler catches not-found condit...unknown2005-04-081-2/+2
* | | | | | | | | Fixed broken auto_incrementunknown2005-04-081-0/+4
* | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-081-6/+10
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-04-071-4/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-04-078-80/+110
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-04-061-6/+10
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-04-061-6/+10
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Stupid error message for 'insert "aaa"' into decimal column fixedunknown2005-04-061-6/+10
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-086-26/+42
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-071-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-076-26/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Moved some old test and added a new test to only be run with mysql-test-run -...unknown2005-04-076-26/+42
| | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-071-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Mergeunknown2005-04-071-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB stor...unknown2005-04-071-1/+4
| * | | | | | | | | | | | | Mergeunknown2005-04-071-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-071-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storageunknown2005-04-071-1/+6
| | * | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-072-12/+161
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-0715-103/+284
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-072-14/+155
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge mysql.com:/home/psergey/mysql-4.1-bug8877unknown2005-04-071-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Post-review fixes: local variable renamedunknown2005-04-071-5/+5
| | * | | | | | | | | | | | BUG#8877: Post-merge fixes.unknown2005-04-071-6/+9
| | * | | | | | | | | | | | Merge mysql.com:/home/psergey/mysql-4.1-bug8877unknown2005-04-051-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Removed extra commentunknown2005-04-051-1/+0
| | * | | | | | | | | | | | Manually merged (will need a post-merge fix)unknown2005-04-052-11/+150
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Fix for BUG#8877: Implementation of unknown2005-04-052-12/+162
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-04-071-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix for bug #9566 "explicit LOCK TABLE and store procedures result inunknown2005-04-071-4/+9
| * | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-04-063-16/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | manually mergedunknown2005-04-062-11/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-061-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \