summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge xiphis.org:/home/antony/work2/mysql-5.1unknown2005-12-2145-2566/+1237
|\
| * Finalize storage engine pluginsunknown2005-12-2145-2566/+1237
* | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-217-2/+2647
|\ \
| * | Adding XPath support: ExtractValue and UpdateXML functions.unknown2005-12-217-2/+2647
* | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-212-1/+21
|\ \ \
| * | | Minor portability issue on big endian boxesunknown2005-12-211-1/+1
| * | | BUG#15981 Current 5.1 fails for NDB testsunknown2005-12-201-0/+20
| |/ /
* | | sql_trigger.cc, item.cc:unknown2005-12-192-8/+8
|/ /
* | Bug fix for bug #15843 "Added mmap support in myisam creates compile problemunknown2005-12-191-4/+0
* | Mergeunknown2005-12-182-20/+0
|\ \
| * \ Mergeunknown2005-12-181-1/+3
| |\ \
| * \ \ Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-141-1/+0
| |\ \ \
| | * \ \ Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-141-1/+0
| | |\ \ \
| | | * | | Remove unused class member as suggested by Guilhem.unknown2005-12-141-1/+0
| * | | | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-143-5/+4
| |\ \ \ \ \
| | * \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-143-5/+4
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releaseunknown2005-12-142-3/+2
| | | |\ \ \ \
| | | * \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-141-2/+2
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-121-2/+2
| | | | |\ \ \ \
| | | | | * \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releaseunknown2005-12-081-2/+2
| | | | | |\ \ \ \
| * | | | | \ \ \ \ Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-141-2/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-12-141-2/+20
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0unknown2005-12-1411-79/+79
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Disabled archive db for Netware.unknown2005-12-142-4/+4
| * | | | | | | | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-123-2/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0unknown2005-12-086-46/+72
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-0723-1196/+1901
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-0718-409/+349
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-5.0unknown2005-12-067-46/+133
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-5.1-14809unknown2005-12-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Avoid setting DB_NOOVERWRITE flag on hidden primary keys in tablesunknown2005-11-091-1/+1
* | | | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-155-3/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.1-newunknown2005-12-155-3/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | bug #15524 (partitioning range/list violation error message is insufficient)unknown2005-12-152-2/+8
| | * | | | | | | | | | | | | | bug #15521 (Cannot reorganise a partition with a new name equal to the old name)unknown2005-12-153-1/+61
* | | | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-releaseunknown2005-12-152-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure o...unknown2005-12-141-1/+3
| * | | | | | | | | | | | | | bug#15682 - ndbunknown2005-12-141-2/+19
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge joerg@trift2:/M50/part2-ramilunknown2005-12-142-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Fix for bug #15630: Test case failure in sp-dynamic, sp-error, and sp.unknown2005-12-121-1/+1
| * | | | | | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2005-12-121-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix for bug #15602: 5.0.17 test case 'create' failure.unknown2005-12-091-2/+1
| * | | | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1unknown2005-12-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix -ansi -pedantic compilation failure. Fix coding style.unknown2005-12-071-6/+6
* | | | | | | | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-142-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Changes from the innodb-5.1-ss28 snapshot.unknown2005-12-132-1/+10
* | | | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-141-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-12-141-2/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | bug#15682 - ndb - invalid handling of varchar in position/rnd_posunknown2005-12-141-2/+20
* | | | | | | | | | | | | | | | Removed wrong merge from 5.0 - 5.1unknown2005-12-141-1/+0