summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-07-241-0/+1
|\
| * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909unknown2007-07-191-0/+1
| |\
| | * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909unknown2007-07-191-0/+1
* | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-07-2084-1549/+1284
|\ \ \ | |/ /
| * | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-07-174-14/+120
| |\ \
| * \ \ Merge mysql.com:/home/ram/work/mysql-5.1-maintunknown2007-07-142-6/+49
| |\ \ \
| | * | | Fix for bug #29253: csv table reportedly marked as crashedunknown2007-07-142-6/+49
| * | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbunknown2007-07-1314-63/+80
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bjunknown2007-07-131-3/+3
| | |\ \ \
| | | * | | Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941unknown2007-07-041-3/+3
| | * | | | Bug #29762 The ndbapi-examples don't work as expected due to api changes in M...unknown2007-07-131-5/+7
| | * | | | fix ndb_version.h so that it is usable and make some functions public to hand...unknown2007-07-1112-55/+70
| * | | | | Merge sita.local:/Users/tsmith/m/bk/inno/jul5/51-snapunknown2007-07-1068-1480/+1155
| |\ \ \ \ \
| | * | | | | Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569.unknown2007-07-1068-1480/+1155
* | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-07-194-14/+120
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2007-07-172-0/+82
| |\ \ \ \ \ \
| | * | | | | | Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-07-162-0/+82
| | |/ / / / /
| * | | | | | Merge chilla.local:/home/mydev/mysql-5.1-amainunknown2007-07-142-14/+38
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | BUG#29445 - match ... against () never returnsunknown2007-07-131-2/+8
| | * | | | | fix for smarter index mergein fulltextunknown2007-07-111-6/+19
| | * | | | | BUG#29445 - match ... against () never returnsunknown2007-07-101-1/+2
| | * | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2007-07-091-6/+10
| | |\ \ \ \ \
| | | * | | | | BUG#29464 - load data infile into table with big5 chinese fulltext indexunknown2007-07-051-6/+10
* | | | | | | | 5.0-opt -> 5.1-opt mergeunknown2007-07-181-2/+2
* | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-optunknown2007-07-182-5/+24
* | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-07-133-44/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | porting 29070 to 5.1-opt unknown2007-07-111-3/+3
| * | | | | | | Merge magare.gmz:/home/kgeorge/mysql/autopush/B29325-5.0-optunknown2007-07-112-46/+31
| * | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B29325-5.0-optunknown2007-07-112-2/+6
| |/ / / / / /
* | | | | | | Fix for bug #29652: csv.test failure: two changes conflict after mergeunknown2007-07-102-2/+14
| |_|/ / / / |/| | | | |
* | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-07-096-16/+240
|\ \ \ \ \ \
| * \ \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndbunknown2007-07-096-16/+240
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbunknown2007-07-041-1/+1
| | |\ \ \ \ \
| | | * \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2007-07-041-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-07-041-1/+1
| | * | | | | | | backport compute hashunknown2007-07-042-0/+210
| | |/ / / / / /
| | * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2007-07-031-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | ndb - bug#28642 - Tablespace returning incorrect usage statusunknown2007-07-031-1/+1
| | * | | | | | ndb - bug#25901unknown2007-07-033-14/+28
* | | | | | | | Merge sita.local:/Users/tsmith/m/bk/51unknown2007-07-095-166/+397
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-064-165/+396
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-enginesunknown2007-07-064-165/+396
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-enginesunknown2007-07-014-165/+396
| | | |\ \ \ \ \
| | | | * | | | | Post-merge fixes.unknown2007-06-302-24/+39
| | | | * | | | | Merge synthia.local:/home/mydev/mysql-5.0-axmrgunknown2007-06-302-147/+374
| | | | * | | | | Merge synthia.local:/home/mydev/mysql-5.1-ateamunknown2007-06-301-17/+3
| | | | |\ \ \ \ \
| | | | | * | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG29250/mysql-5.0-enginesunknown2007-06-281-17/+3
| | | | * | | | | | Merge chilla.local:/home/mydev/mysql-5.1-amainunknown2007-06-241-1/+4
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | / | | | | | |_|_|_|/ | | | | |/| | | |
| | | | | * | | | Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-enginesunknown2007-06-221-1/+4
| | | | | |\ \ \ \
| | | | | | * | | | BUG#28971 - ALTER TABLE followed by UPDATE for a CSV tableunknown2007-06-151-1/+4