summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2006-12-052-3/+2
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2006-12-051-1/+1
|\
| * Merge bk-internal:/home/bk/mysql-5.1unknown2006-12-051-1/+1
| |\
| | * Change ::fileno() to fileno() in ndb/common/util/File.cpp.unknown2006-12-041-1/+1
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2006-12-042-2/+21
|\ \ \ | |/ / |/| |
| * | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951unknown2006-12-041-0/+2
| |\ \
| | * | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951unknown2006-12-041-0/+2
| * | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2006-12-011-2/+19
| |\ \ \
| | * | | Merge example.com:/work/bug24395-v2/my50unknown2006-12-011-2/+19
| * | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.1unknown2006-11-297-21/+35
| |\ \ \ \
| * \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.1unknown2006-11-2997-377/+471
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | Merge bk-internal:/home/bk/mysql-5.1unknown2006-12-041-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-301-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-281-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-231-1/+1
| | | |\ \ \
| | | | * | | Fix DBUG_ENTER to print the correct function name unknown2006-11-211-1/+1
* | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1unknown2006-12-0118-26/+27
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-011-32/+50
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-3018-26/+27
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | After merge fixesunknown2006-11-305-4/+4
| | * | | | | | | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-308-17/+17
| | * | | | | | | Fixed compiler warnings (Mostly VC++):unknown2006-11-306-6/+7
| | * | | | | | | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-291-1/+1
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbunknown2006-12-011-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb...unknown2006-12-011-2/+2
* | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-workunknown2006-12-013-5/+99
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ndb - bug#24655unknown2006-12-013-5/+90
| * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2006-12-011-0/+9
* | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-workunknown2006-12-0136-122/+540
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2006-12-011-1/+4
| * | | | | | | | | ndb - bug#24717unknown2006-12-013-7/+13
| * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2006-12-015-6/+62
| * | | | | | | | | ndb -unknown2006-12-011-1/+1
| * | | | | | | | | ndb - bug#24717unknown2006-12-017-49/+124
| * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2006-12-0116-38/+125
| * | | | | | | | | ndb - bug#24476unknown2006-12-011-2/+3
| * | | | | | | | | ndb - bug#24105unknown2006-11-291-0/+17
| * | | | | | | | | ndb - bug#24544unknown2006-11-284-61/+85
| * | | | | | | | | ndb - bug#24543unknown2006-11-235-0/+50
| * | | | | | | | | ndb - no bugs numberunknown2006-11-212-2/+16
| * | | | | | | | | ndb - bug#24331unknown2006-11-212-2/+6
| * | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2006-11-214-4/+85
* | | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbunknown2006-12-0122-52/+2340
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | For merging mysql-5.1-new-ndb-bj tree into mysql-5.1-new-ndb treeunknown2006-12-011-36/+0
| * | | | | | | | | | Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjunknown2006-12-0122-52/+2376
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-new-n...unknown2006-11-141-2/+14
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | BUG#19808, Online config. Wrong error message if DataMemory less than a data ...unknown2006-11-141-2/+14
| | * | | | | | | | | | Bug#19203, Different error reports for similar cases - unable allocate memoryunknown2006-11-135-8/+20
| | |/ / / / / / / / /
| | * | | | | | | | | Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352unknown2006-11-021-6/+8
| | * | | | | | | | | Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052unknown2006-11-013-6/+12