summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* After merge fixesmonty@mysql.com2006-06-052-3/+10
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-06-0416-122/+173
|\
| * This changeset is largely a handler cleanup changeset (WL#3281), but includes...monty@mysql.com2006-06-0416-123/+177
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-newguilhem@mysql.com2006-06-022-3/+10
|\ \
| * | First push for WL#3146 "less locking in auto_increment". It is a 0-real-chang...guilhem@mysql.com2006-06-022-3/+10
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newjani@ua141d10.elisa.omakaista.fi2006-06-011-1/+1
|\ \ \
| * | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0jani@a193-229-222-105.elisa-laajakaista.fi2006-05-301-1/+1
| |/ /
* | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newmikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se2006-06-011-8/+9
|\ \ \
| * \ \ Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newmikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se2006-06-011-8/+9
| |\ \ \
| | * \ \ Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-newmikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se2006-05-311-8/+9
| | |\ \ \
| | | * | | BUG#17310: Archive error for drop databasemikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se2006-05-291-8/+9
| | | |/ /
* | | | | Merge jonas@perch:src/mysql-5.1-new-ndbtomas@poseidon.ndb.mysql.com2006-06-015-3/+92
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbjonas@perch.ndb.mysql.com2006-06-015-3/+92
| |\ \ \ \
| | * | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-06-015-3/+92
* | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-06-0110-11/+134
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbmskold@mysql.com2006-05-313-6/+9
| |\ \ \ \ \
| | * | | | | Bug #20142 show engine ndb status may falsely return latest epoch == 0tomas@poseidon.ndb.mysql.com2006-05-303-6/+9
| * | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-newmskold@mysql.com2006-05-318-5/+125
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Bug #16997 Table rename that changes database does not rename indexes: Moved ...mskold@mysql.com2006-05-318-5/+125
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newserg@serg.mylan2006-05-319-91/+129
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newserg@serg.mylan2006-05-309-91/+129
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | don't try to "estimate" a number of words that a plugin parser can produceserg@serg.mylan2006-05-301-3/+27
| | * | | | | Now ftparser does not need to bother about memory management -serg@serg.mylan2006-05-308-59/+72
| | * | | | | Incompatible ftparser plugin API change.serg@serg.mylan2006-05-283-30/+31
* | | | | | | sql/Makefile.am: better mysqld dependenciesserg@sergbook.mysql.com2006-05-301-12/+5
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newserg@sergbook.mysql.com2006-05-285-199/+58
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | handlerton cleanup:serg@sergbook.mysql.com2006-05-285-199/+58
* | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-2511-168/+303
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/space/pekka/ndb/version/my51pekka@mysql.com2006-05-2511-168/+303
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | ndb - bug#14509 v5.1 part 1/2 : ndb api level [requires part 2/2]pekka@mysql.com2006-05-257-62/+133
| | * | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509pekka@mysql.com2006-05-174-89/+123
| | * | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509pekka@mysql.com2006-05-161-2/+2
| | * | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509pekka@mysql.com2006-05-163-27/+26
| | * | | | | | Merge mysql.com:/space/pekka/ndb/version/my50-bug14509pekka@mysql.com2006-05-166-97/+128
| | |/ / / / /
* | | | | | | The previous patch fixed the csv engine to support dos, linux, and mac line e...reggie@big_geek.2006-05-241-0/+7
* | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-ktreggie@big_geek.2006-05-241-6/+14
|\ \ \ \ \ \ \
| * | | | | | | some small fixupsreggie@big_geek.2006-05-241-6/+14
* | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-241-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-newsvoj@april.(none)2006-05-241-0/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Merge april.(none):/home/svoj/devel/BitKeeper/mysql-5.1-newsvoj@april.(none)2006-05-241-0/+2
| | |\ \ \ \ \
| | | * | | | | Merge april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0svoj@april.(none)2006-05-181-0/+2
| | | |/ / / /
* | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-236-53/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | BUG#20015 mgmsrv and mgmapi: get statport is dead codestewart@mysql.com2006-05-234-49/+0
| * | | | | | Change = to == in ndbrequiremsvensson@shellback.(none)2006-05-221-1/+1
| | |_|/ / / | |/| | | |
| * | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-05-221-3/+5
| |\ \ \ \ \
| | * | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-maintomas@poseidon.ndb.mysql.com2006-05-221-3/+5
* | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-newrburnett@bk-internal.mysql.com2006-05-2216-328/+595
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/5.0/mainstewart@mysql.com2006-05-221-31/+39
| |/ / / / /
| * | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-newkent@mysql.com2006-05-203-40/+170
| |\ \ \ \ \
| | * | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-05-193-40/+170