summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Manual mergeunknown2006-03-307-9/+27
|\
| * Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-306-14/+34
| |\
| | * Fixed bug#15560: GROUP_CONCAT wasn't ready for WITH ROLLUP queriesunknown2006-03-296-14/+34
| * | Cleanup during review of new pushed codeunknown2006-03-301-11/+7
* | | post-merge fixunknown2006-03-301-3/+1
* | | Mergeunknown2006-03-301-0/+17
|\ \ \ | |/ /
| * | Fix for bug#15316 SET value having comma not correctly handledunknown2006-03-291-0/+17
| * | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-281-0/+5
| |\ \
| * \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-231-1/+11
| |\ \ \
* | | | | Fix an -ansi -pedantic compilation failureunknown2006-03-301-1/+1
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-306-11/+36
|\ \ \ \ \
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2006-03-292-9/+19
| |\ \ \ \ \
| | * | | | | Proposed fix for bug #17764 "Trigger crashes MyISAM table"unknown2006-03-292-9/+19
| * | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtimeunknown2006-03-282-1/+11
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtimeunknown2006-03-282-1/+11
| | |\ \ \ \ \ \
| | | * | | | | | Review fix for BUG#17015: Routine name truncation not an errorunknown2006-03-282-5/+10
| | | * | | | | | Fixed BUG#17015: Routine name truncation not an errorunknown2006-02-161-1/+6
| * | | | | | | | Removed forgotten comment line in sql_select.cc.unknown2006-03-281-1/+0
| * | | | | | | | Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtimeunknown2006-03-281-1/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Post review fixes for BUG#16474: SP crashed MySQL.unknown2006-03-281-2/+3
| | * | | | | | | Fixed BUG#16474: SP crashed MySQLunknown2006-03-101-1/+5
| * | | | | | | | A fix and a test case for Bug#15683 "crash, Function on nested unknown2006-03-281-0/+1
* | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-301-40/+48
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-291-40/+48
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Applied innodb-5.0-ss368 snapshotunknown2006-03-291-40/+48
* | | | | | | | | | | Reverting yesterday's patch. (cmiller:1.2099)unknown2006-03-291-1/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-281-6/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug#11151: LOAD DATA INFILE commits transaction in 5.0unknown2006-03-281-6/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-281-1/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-281-1/+3
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2006-03-281-1/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | ndb - bug#17729 bug#18406unknown2006-03-281-1/+3
| | | * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-03-221-0/+7
| | | |\ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ Merge mysql.com:/usr/home/bar/mysql-4.1.b15098unknown2006-03-281-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Bug#15098 CAST(column double TO signed int), wrong resultunknown2005-12-061-0/+5
* | | | | | | | | | | | Post review fix for Bug #15722 Engine_condition_pushdown fails when using bl...unknown2006-03-281-0/+2
* | | | | | | | | | | | Fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text)unknown2006-03-281-1/+4
* | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-271-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed bug #18386.unknown2006-03-271-7/+4
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Fix for BUG#15921: DROP TRIGGER - can't be drop trigger createdunknown2006-03-283-10/+67
|/ / / / / / / / / /
* | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0unknown2006-03-241-4/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed bug #17164.unknown2006-03-241-4/+7
* | | | | | | | | | | Follow-up for the fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactionalunknown2006-03-241-1/+3
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2006-03-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix 'metaphon' function to correctly calculate the length of the returned stringunknown2006-03-241-1/+1
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-242-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional tables corruptunknown2006-03-242-1/+4
* | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-03-242-31/+172
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | If doing write, then peeking is not neededunknown2006-03-241-1/+1