summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge monty@192.168.0.9:/my/mysql-5.1monty@hasky.mysql.fi2006-06-231-1/+1
|\
| * Remove compiler warningsmonty@mysql.com2006-06-231-1/+1
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@hasky.mysql.fi2006-06-2222-18/+1154
|\ \ | |/ |/|
| * Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51pekka@orca.ndb.mysql.com2006-06-221-1/+1
| |\
| | * ndb - bug#14935 : Correct error to TUX on node alloc fail. There is more bug...pekka@clam.ndb.mysql.com2006-06-191-1/+1
| * | Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51pekka@orca.ndb.mysql.com2006-06-2221-17/+1153
| |\ \
| | * | ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come)pekka@clam.ndb.mysql.com2006-06-227-11/+195
| | * | Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781pekka@clam.ndb.mysql.com2006-06-1517-16/+968
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@mysql.com2006-06-223-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2006-06-2116-32/+78
| |\ \ \
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@mysql.com2006-06-193-2/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | unsigned char -> ucharmonty@mysql.com2006-06-193-2/+4
* | | | | Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51pekka@orca.ndb.mysql.com2006-06-214-353/+786
|\ \ \ \ \
| * | | | | ndb - add test_event_merge to daily-devel-tests.txtpekka@clam.ndb.mysql.com2006-06-211-0/+10
| * | | | | ndb - bug#18102: fixes on NDB API levelpekka@clam.ndb.mysql.com2006-06-213-353/+776
* | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars@dl145j.mysql.com2006-06-2116-32/+78
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1tomas@poseidon.ndb.mysql.com2006-06-218-8/+37
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.ndb.mysql.com2006-06-205-7/+10
| | * | | | Bug #17297 Fix error messagestomas@poseidon.ndb.mysql.com2006-06-204-2/+9
| | * | | | Bug #19543 Out REDO log on subscription creation during startup, missing erro...tomas@poseidon.ndb.mysql.com2006-06-202-0/+19
| | | |_|/ | | |/| |
| * | | | Mergekent@mysql.com2006-06-201-1/+2
| * | | | Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmergestewart@mysql.com2006-06-204-6/+14
| * | | | Merge april:devel/BitKeeper/mysql-5.1-enginessvoj@may.pils.ru2006-06-193-17/+25
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-enginessvoj@may.pils.ru2006-06-143-17/+25
| | |\ \ \
| | | * | | BUG#19580 - FULLTEXT search produces wrong results on UTF-8 columnssvoj@may.pils.ru2006-05-293-17/+25
| | * | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesacurtis@xiphis.org2006-06-125-29/+27
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars@dl145j.mysql.com2006-06-1975-1218/+2253
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars@mysql.com2006-06-1675-1218/+2253
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Post innodb-5.1-ss594 modifications.aivanov@mysql.com2006-06-151-1/+1
| | * | | | Post innodb-5.1-ss594 modifications.aivanov@mysql.com2006-06-151-0/+2
| | * | | | Making dtype_get_max_size() non-inline to avoid build erroraivanov@mysql.com2006-06-122-2/+0
| | * | | | Applied innodb-5.1-ss594 snapshot.aivanov@mysql.com2006-06-0175-1218/+2253
* | | | | | Manually mergedevgen@moonbone.local2006-06-181-1/+1
* | | | | | ndb - bug#19285 post merge 5.0->5.1 fix (error codes)pekka@clam.ndb.mysql.com2006-06-171-2/+3
* | | | | | Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285pekka@clam.ndb.mysql.com2006-06-171-1/+1
* | | | | | Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285pekka@clam.ndb.mysql.com2006-06-175-68/+177
* | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1petr@outpost.site2006-06-162-198/+377
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1petr@mysql.com2006-06-152-198/+377
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | fix test failure in the team treepetr@mysql.com2006-06-051-15/+12
| | * | | | | fix csv test failure on aixpetr@mysql.com2006-05-311-4/+5
| | * | | | | one more portability fixpetr@mysql.com2006-05-301-1/+1
| | * | | | | fix windows build of CSVpetr@mysql.com2006-05-301-3/+4
| | * | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-newpetr@mysql.com2006-05-302-201/+385
| | |\ \ \ \ \
| | | * | | | | WL#3244 "CSV engine: convert mmap to read/write calls"petr@mysql.com2006-05-202-12/+10
| | | * | | | | WL#3244 "CSV engine: convert mmap to read/write calls"petr@mysql.com2006-05-192-177/+355
* | | | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queuestewart@willster.(none)2006-06-167-206/+541
|/ / / / / / /
* | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1tomas@poseidon.ndb.mysql.com2006-06-141-4/+12
|\ \ \ \ \ \ \
| * | | | | | | correct initialization of event operation to enable early deletetomas@poseidon.ndb.mysql.com2006-06-141-4/+12
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.(none)2006-06-131-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newcmiller@zippy.(none)2006-05-261-2/+1
| |\ \ \ \ \ \ \