summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge example.com:/work/bug23074/my50-bug23074unknown2006-10-111-2/+2
* Added license information display to output of plugins schema, and tagged all...unknown2006-10-059-0/+9
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2006-10-0389-3244/+3306
|\
| * Merge siva.hindu.god:/usr/home/tim/m/bk/50unknown2006-09-291-3/+6
| * Merge siva.hindu.god:/usr/home/tim/m/bk/g51unknown2006-09-2989-3244/+3306
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-09-2889-3244/+3306
| | |\
| | | * Merge mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.0-maint-gcaunknown2006-09-271-1/+1
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-09-2389-3243/+3305
| | | |\
| | | | * Fix windows and aix compile problemunknown2006-09-221-1/+2
| | | | * Fix Solaris 10 compile failureunknown2006-09-211-1/+1
| | | | * Merge shellback.(none):/home/msvensson/mysql/mysql-5.1unknown2006-09-2119-77/+120
| | | | |\
| | | | * \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2006-09-2186-3237/+3280
| | | | |\ \
| | | | | * | Applied innodb-5.1 snapshots ss799 and ss854unknown2006-09-2186-3237/+3280
| | | | * | | Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maintunknown2006-09-203-7/+25
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | Merge naruto.:C:/cpp/bug20789/my50-bug20789unknown2006-09-203-1/+30
| | | | | * | Merge naruto.:C:/cpp/bug20789/my50-bug20789unknown2006-09-171-11/+0
* | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-10-024-5/+12
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2006-09-291-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-bug22384unknown2006-09-281-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-enginesunknown2006-09-292-2/+7
| * | | | | | | Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-enginesunknown2006-09-271-0/+3
| * | | | | | | Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-enginesunknown2006-09-271-2/+1
| |/ / / / / /
* | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-10-0121-191/+264
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge zim.(none):/home/brian/mysql/merge-5.1unknown2006-09-3021-191/+264
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | This patch adds handlerton passing to functions. NDB and Innodb still require...unknown2006-09-3015-131/+182
| | * | | | | | This removes the passing of global hton to engine instance. unknown2006-09-2918-55/+82
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.1unknown2006-09-3010-16/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-archunknown2006-09-282-7/+16
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge gbichot@bk-internal:/home/bk/mysql-5.1-archunknown2006-09-282-7/+16
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | In the handlerton, cursor creation function don't have an argumentunknown2006-09-282-7/+16
| | | | |_|/ / / | | | |/| | | |
| * | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-09-289-9/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | Removed Field (this came in as an idea from a previous patch by Serg)unknown2006-09-269-9/+9
| | |/ / / /
* | | | | | Merge bk-internal:/home/bk/mysql-5.1unknown2006-09-281-3/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1unknown2006-09-281-3/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-optunknown2006-09-271-3/+6
| | | |/ / | | |/| |
* | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-09-283-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2006-09-153-6/+6
| |\ \ \ \
| | * | | | Post-review fixes forunknown2006-09-153-6/+6
* | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndbunknown2006-09-2226-224/+270
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge chilla.local:/home/mydev/mysql-5.1--mainunknown2006-09-2110-10/+10
| |\ \ \ \ \
| | * | | | | Bug#22417unknown2006-09-1810-10/+10
| | | |_|/ / | | |/| | |
| * | | | | Merge chilla.local:/home/mydev/mysql-5.0-bug14400-montyunknown2006-09-193-37/+37
| * | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesunknown2006-09-185-10/+30
| * | | | | Merge april.(none):/home/svoj/devel/bk/mysql-5.1unknown2006-09-183-20/+43
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2006-09-151-2/+2
| | |\ \ \ \
| | | * | | | Merge chilla.local:/home/mydev/mysql-5.0-bug14400unknown2006-09-141-2/+2
| | * | | | | Merge chilla.local:/home/mydev/mysql-5.1--mainunknown2006-09-143-20/+43
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | Merge chilla.local:/home/mydev/mysql-5.0-bug14400unknown2006-09-071-20/+34
| * | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-09-1610-143/+150
| |\ \ \ \ \
| | * | | | | This changes the order of the universe, black is now the new white.unknown2006-09-1510-143/+150
| | |/ / / /