summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2006-10-061-1/+1
|\
| * BUG#19459 (BINLOG RBR command does not lock tables correctly causingmats@romeo.(none)2006-10-021-1/+1
* | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-10-0121-191/+264
|\ \
| * \ Merge zim.(none):/home/brian/mysql/merge-5.1brian@zim.(none)2006-09-3021-191/+264
| |\ \
| | * | This patch adds handlerton passing to functions. NDB and Innodb still require...brian@zim.(none)2006-09-3015-131/+182
| | * | This removes the passing of global hton to engine instance. brian@zim.(none)2006-09-2918-55/+82
* | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-09-3010-16/+25
|\ \ \ \ | |/ / /
| * | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-archbrian@zim.(none)2006-09-282-7/+16
| |\ \ \
| | * \ \ Merge gbichot@bk-internal:/home/bk/mysql-5.1-archgbichot@dl145h.mysql.com2006-09-282-7/+16
| | |\ \ \ | | | |/ / | | |/| |
| | | * | In the handlerton, cursor creation function don't have an argumentgbichot@dl145h.mysql.com2006-09-282-7/+16
| * | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1brian@zim.(none)2006-09-289-9/+9
| |\ \ \ \ | | |/ / /
| | * | | Removed Field (this came in as an idea from a previous patch by Serg)brian@zim.(none)2006-09-269-9/+9
| | |/ /
* | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-09-281-3/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1gkodinov@dl145s.mysql.com2006-09-281-3/+6
| |\ \ \ | | |/ / | |/| |
| | * | Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-optgkodinov/kgeorge@macbook.gmz2006-09-271-3/+6
* | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1petr/cps@owlet.local2006-09-283-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimepetr/cps@owlet.local2006-09-153-6/+6
| |\ \ \
| | * | | Post-review fixes forpetr/cps@mysql.com/owlet.local2006-09-153-6/+6
* | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndbmskold/marty@linux.site2006-09-2226-224/+270
|\ \ \ \ \
| * \ \ \ \ Merge chilla.local:/home/mydev/mysql-5.1--mainistruewing@chilla.local2006-09-2110-10/+10
| |\ \ \ \ \
| | * | | | | Bug#22417acurtis/antony@xiphis.org/ltamd64.xiphis.org2006-09-1810-10/+10
| | | |_|/ / | | |/| | |
| * | | | | Merge chilla.local:/home/mydev/mysql-5.0-bug14400-montyistruewing@chilla.local2006-09-193-37/+37
| * | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesacurtis/antony@ltamd64.xiphis.org2006-09-185-10/+30
| * | | | | Merge april.(none):/home/svoj/devel/bk/mysql-5.1svoj@april.(none)2006-09-183-20/+43
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2006-09-151-2/+2
| | |\ \ \ \
| | | * | | | Merge chilla.local:/home/mydev/mysql-5.0-bug14400istruewing@chilla.local2006-09-141-2/+2
| | * | | | | Merge chilla.local:/home/mydev/mysql-5.1--mainistruewing@chilla.local2006-09-143-20/+43
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | Merge chilla.local:/home/mydev/mysql-5.0-bug14400istruewing@chilla.local2006-09-071-20/+34
| * | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-09-1610-143/+150
| |\ \ \ \ \
| | * | | | | This changes the order of the universe, black is now the new white.brian@zim.(none)2006-09-1510-143/+150
| | |/ / / /
| * | | | | Merge shellback.(none):/home/msvensson/mysql/work/my50-workmsvensson@shellback.(none)2006-09-151-4/+0
| * | | | | Post-merge fix: remove dup() call in ha_archive.cc which resulted in a memory...tsmith/tim@siva.hindu.god2006-09-141-1/+1
| * | | | | Post-merge fixes:tsmith/tim@siva.hindu.god2006-09-131-1/+0
| * | | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50tsmith@maint2.mysql.com2006-09-132-1/+2
| |/ / / /
* | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1mskold/marty@linux.site2006-09-14143-8470/+17346
|\ \ \ \ \ | |/ / / /
| * | | | Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNO...msvensson@neptunus.(none)2006-09-121-2/+2
| * | | | Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@neptunus.(none)2006-09-121-0/+11
| |\ \ \ \
| | * | | | Merge naruto.:C:/cpp/bug20789/my50-bug20789Kristofer.Pettersson@naruto.2006-09-121-0/+11
| * | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-09-12128-8505/+9383
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.1msvensson@shellback.(none)2006-09-08127-8454/+9301
| | |\ \ \ \
| | | * | | | mi_test_all.sh needs "./" before the executable names otherwise theyguilhem@gbichot3.local2006-09-061-128/+128
| | | * | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2006-09-051-2/+2
| | | * | | | Applied InnoDB 5.1 snapshot ss787.tsmith@maint1.mysql.com2006-09-05126-8199/+9160
| | | * | | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51tsmith@maint2.mysql.com2006-09-0417-171/+57
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Manual merge.cmiller@zippy.cornsilk.net2006-08-301-1/+1
| | | | |\ \ \
| | | | * \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1tnurnberg@salvation.intern.azundris.com2006-08-2834-181/+6893
| | | | |\ \ \ \ | | | | | |/ / /
| | | | * | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1tnurnberg@salvation.intern.azundris.com2006-08-212-3/+1
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51tnurnberg@salvation.intern.azundris.com2006-08-1718-186/+65
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-mainttnurnberg@maint1.mysql.com2006-08-1718-186/+65
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge tnurnberg@maint1:/data/localhome/tnurnberg/i51tnurnberg@salvation.intern.azundris.com2006-08-1618-186/+65
| | | | | | |\ \ \ \ \
View Lorry Controller Status