summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1tnurnberg@salvation.intern.azundris.com2006-08-2834-181/+6893
|\
| * Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1brian@zim.(none)2006-08-2534-177/+6888
| |\
| | * Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-archbrian@zim.(none)2006-08-251-0/+1
| | |\
| | | * Cleanup of unused variables.brian@zim.(none)2006-08-251-0/+1
| | * | no longer need ifdef as plugin is conditionally compiledacurtis/antony@xiphis.org/ltantony.xiphis.org2006-08-251-2/+0
| | * | fix for windows buildacurtis/antony@xiphis.org/ltantony.xiphis.org2006-08-242-0/+2
| | |/
| | * This patch removes need for a innodb to have its own configure. brian@zim.(none)2006-08-235-160/+79
| | * This changest:brian@zim.(none)2006-08-222-3/+3
| | * This changeset moves the ha_myisam files to their storage directories. It al...brian@zim.(none)2006-08-1911-9/+2016
| | * Update to push all of merge into the merge storage directory.brian@zim.(none)2006-08-195-2/+692
| | * Moved heap into its own directory.brian@zim.(none)2006-08-193-6/+855
| | * Major changes are plug.in files created for almost all storage engines. A few...brian@zim.(none)2006-08-1812-0/+3245
| * | after merge fixpetr/cps@mysql.com/owlet.local2006-08-241-4/+5
* | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1tnurnberg@salvation.intern.azundris.com2006-08-212-3/+1
|\ \ \ | |/ /
| * | Many files:kent@mysql.com/g4-2.local2006-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
| | |\
| | | * Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.tsmith@production.mysql.com2006-08-1518-186/+65
* | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1patg@govinda.patg.net2006-08-16468-178642/+5
|\ \ \ \ | |/ / /
| * | | Cheery picked Antony's patch to allow for Window's builds in 5.1brian@zim.(none)2006-08-15459-178412/+0
| |/ /
| * | Merge zim.(none):/home/brian/mysql/dep-5.1brian@zim.(none)2006-08-151-0/+2
| |\ \
| | * | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0mskold/marty@linux.site2006-08-151-0/+2
| * | | Merge zim.(none):/home/brian/mysql/dep-5.1brian@zim.(none)2006-08-148-230/+3
| |\ \ \ | | |/ / | |/| |
| | * | Removed warnings for Windows build issues. Edited Windows README to remove re...brian@zim.(none)2006-08-144-4/+2
| | * | Fixed warning message breakage.brian@zim.(none)2006-08-131-1/+1
| | * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintbrian@zim.(none)2006-08-103-225/+0
| | |\ \
| | | * | First stage removeal of BDB.brian@zim.(none)2006-08-093-225/+0
* | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-enginespgalbraith/patg@govinda.patg.net2006-08-155-9/+42
|\ \ \ \ \ | |/ / / /
| * | | | Merge zim.(none):/home/brian/mysql/dep-5.0brian@zim.(none)2006-08-144-8/+41
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-08-141-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-08-121-1/+1
| | |/ /
* | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-enginespgalbraith/patg@govinda.patg.net2006-08-111-1/+1
|/ / /
* | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1patg@govinda.patg.net2006-08-102-31/+138
|\ \ \ | |/ / |/| |
| * | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesingo/istruewing@chilla.local2006-08-021-2/+2
| |\ \
| | * | Bug#18775 - Temporary table from alter table visible to other threadsingo/istruewing@chilla.local2006-08-021-2/+2
| * | | Merge chilla.local:/home/mydev/mysql-5.0-bug20719ingo/mydev@chilla.local2006-07-301-3/+3
| * | | Merge chilla.local:/home/mydev/mysql-5.0-bug20719ingo/mydev@chilla.local2006-07-291-26/+133
* | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-mergekroki/tomash@moonlight.intranet2006-08-095-21/+24
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimepetr/cps@owlet.2006-08-045-21/+24
| |\ \ \
| | * | | Fix Bug #18559 "log tables cannot change engine, andpetr/cps@mysql.com/owlet.2006-08-035-21/+24
* | | | | Merge rama.(none):/home/jimw/my/mysql-5.1-17122jimw@rama.(none)2006-08-031-1/+2
|\ \ \ \ \
| * | | | | Bug #17122: myisam_ftdump requires write access to files although only reads ...jimw@rama.(none)2006-07-211-1/+2
* | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1evgen@sunlight.local2006-08-0230-1371/+1471
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2006-07-3130-1371/+1471
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Make innodb_flush_log_at_trx_commit a settable global variable.aivanov/alexi@mysql.com/mysqld.localdomain2006-07-292-2/+2
| | * | | | | Applied innodb-5.1-ss660 snapshot.aivanov/alexi@mysql.com/mysqld.localdomain2006-07-2628-1369/+1469
* | | | | | | Makefile.am:evgen@sunlight.local2006-08-011-0/+1
* | | | | | | Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysqlevgen@sunlight.local2006-07-301-0/+4
|/ / / / / /
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-07-281-6/+31
|\ \ \ \ \ \