summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Expand)AuthorAgeFilesLines
* InnoDB: Fix compiler warnings and some bad formatting introducedmarko@hundin.mysql.fi2005-01-054-38/+44
* InnoDB: fix corruption in crash recovery of BLOB fields (Bug #7679)marko@hundin.mysql.fi2005-01-051-1/+2
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-01-041-2/+1
|\
| * Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYmonty@mysql.com2005-01-031-2/+1
| |\
| | * log0recv.c:heikki@hundin.mysql.fi2005-01-011-2/+1
| | * row0upd.c:heikki@hundin.mysql.fi2004-12-311-1/+7
* | | sync0sync.h, sync0rw.h:vtkachenko@intelp4d.mysql.com2005-01-032-3/+2
|/ /
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@sergbook.mysql.com2004-12-3113-137/+467
|\ \
| * \ manually mergedserg@sergbook.mysql.com2004-12-3113-137/+467
| |\ \ | | |/
| | * srv0start.c:heikki@hundin.mysql.fi2004-12-291-0/+27
| | * row0mysql.c:heikki@hundin.mysql.fi2004-12-271-36/+69
| | * row0mysql.c:heikki@hundin.mysql.fi2004-12-271-0/+6
| | * Merge hundin.mysql.fi:/home/heikki/mysql-4.0heikki@hundin.mysql.fi2004-12-272-5/+37
| | |\
| | | * row0ins.c:heikki@hundin.mysql.fi2004-12-272-5/+37
| | * | row0mysql.c:heikki@hundin.mysql.fi2004-12-271-1/+1
| | * | ha_innodb.cc, row0ins.c, fil0fil.c:heikki@hundin.mysql.fi2004-12-272-2/+2
| | * | Many files:heikki@hundin.mysql.fi2004-12-2712-90/+320
| | * | Merge hundin.mysql.fi:/home/heikki/mysql-4.0heikki@hundin.mysql.fi2004-12-211-6/+8
| | |\ \ | | | |/
| | | * os0file.c:heikki@hundin.mysql.fi2004-12-211-2/+2
| | | * os0file.c:heikki@hundin.mysql.fi2004-12-211-8/+10
* | | | row0upd.c:heikki@hundin.mysql.fi2004-12-311-1/+7
|/ / /
* | | Merge bk-internal:/home/bk/mysql-5.0vtkachenko@intelp4d.mysql.com2004-12-3113-121/+273
|\ \ \
| * | | Many files:vtkachenko@intelp4d.mysql.com2004-12-248-25/+25
| * | | logging_ok:vtkachenko@intelp4d.mysql.com2004-12-2413-121/+273
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2004-12-315-8/+57
|\ \ \ \
| * \ \ \ Merge with global treemonty@mysql.com2004-12-315-8/+57
| |\ \ \ \
| | * | | | After merge fixesmonty@mysql.com2004-12-313-5/+6
| | * | | | Merge with 4.1monty@mishka.local2004-12-224-4/+52
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Merge mysql.com:/dbdata/psergey/mysql-4.0-bug6976sergefp@mysql.com2004-12-131-0/+16
| | | |\ \ | | | | |/
| | | | * dict0load.c:marko@hundin.mysql.fi2004-12-131-0/+16
| | | * | Merge hundin.mysql.fi:/home/marko/k/mysql-4.0marko@hundin.mysql.fi2004-12-101-1/+0
| | | |\ \ | | | | |/
| | | | * Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-12-102-9/+34
| | | | |\
| | | | * | srv0srv.c:marko@hundin.mysql.fi2004-12-101-1/+0
| | | * | | row0mysql.h:heikki@hundin.mysql.fi2004-12-101-10/+0
| | | * | | dict0dict.c, log.cc:heikki@hundin.mysql.fi2004-12-103-34/+19
| | | * | | Mergeheikki@hundin.mysql.fi2004-12-102-9/+34
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | dict0dict.h, dict0dict.c, ha_innodb.cc:heikki@hundin.mysql.fi2004-12-102-9/+34
| | | | |/
| | | * | dict0dict.c:heikki@hundin.mysql.fi2004-12-101-1/+1
| | | * | dict0dict.c:heikki@hundin.mysql.fi2004-12-101-2/+26
| | | * | os0file.c:heikki@hundin.mysql.fi2004-12-081-1/+10
* | | | | page0page.c:marko@hundin.mysql.fi2004-12-311-2/+6
* | | | | row0upd.c:marko@hundin.mysql.fi2004-12-311-1/+1
|/ / / /
* | | | InnoDB: Remove crash in in-place update from NULL to non-NULL. (Bug #7591)marko@hundin.mysql.fi2004-12-302-17/+20
* | | | InnoDB: fix bug in insert buffer merge of prefix columns inmarko@hundin.mysql.fi2004-12-291-3/+4
* | | | InnoDB: Remove dependency on rem0rec.ic from dict0dict.ic (Bug #7464)marko@hundin.mysql.fi2004-12-294-92/+33
* | | | InnoDB: Fix some bugs in the new record format. (Bug #7493)marko@hundin.mysql.fi2004-12-289-35/+13
* | | | Ensure "bottom-up" order of "inline functions" within 'innobase/include/rem0r...joerg@mysql.com2004-12-271-39/+39
|/ / /
* | | Content merge.jan@hundin.mysql.fi2004-12-2115-94/+312
|\ \ \
| * | | Fixed compilation for old Linux distributions that have no HugeTLB supportkaa@polly.local2004-12-201-4/+10
| * | | Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0kaa@polly.local2004-12-191-1/+1
| |\ \ \