summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Expand)AuthorAgeFilesLines
* Merge with 4.1monty@mysql.com2004-11-121-25/+28
|\
| * merge with 4.0monty@mysql.com2004-11-121-25/+28
| |\
| | * InnoDB: fix bugs in the FOREIGN KEY parser (Bug #6340)marko@hundin.mysql.fi2004-11-031-26/+29
* | | Merge avenger.(none):/export/brian/mysql/test/4.1brian@avenger.(none)2004-11-111-24/+0
|\ \ \ | |/ /
| * | trx0purge.c:heikki@hundin.mysql.fi2004-11-111-24/+0
* | | Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)brian@avenger.(none)2004-11-111-3/+6
|\ \ \ | |/ /
| * | dict0dict.ic:heikki@hundin.mysql.fi2004-11-091-3/+6
* | | merge on pullmonty@mysql.com2004-11-0910-19/+124
|\ \ \
| * \ \ Merge with 4.1 to get new thd->mem_root handlingmonty@mysql.com2004-11-084-4/+37
| |\ \ \ | | |/ /
| | * | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1marko@hundin.mysql.fi2004-11-044-4/+37
| | |\ \
| | | * | InnoDB: commit after every 10000 rows in ALTER TABLEmarko@hundin.mysql.fi2004-11-034-4/+37
| * | | | Merge with 4.1 to get in latest bug fixesmonty@mysql.com2004-11-047-15/+87
| |\ \ \ \ | | |/ / /
| | * | | ibuf0ibuf.c:heikki@hundin.mysql.fi2004-11-041-2/+4
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-11-021-0/+14
| | |\ \ \ | | | |/ /
| | | * | dict0load.c:heikki@hundin.mysql.fi2004-11-021-0/+14
| | * | | merge with 4.0monty@mysql.com2004-11-026-13/+69
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * row0mysql.c, pars0pars.c, eval0eval.c, dict0load.c, dict0dict.c, dict0crea.c:heikki@hundin.mysql.fi2004-10-316-13/+69
* | | | Fixed a bug in UPDATE statement with no index column in where condition jan@hundin.mysql.fi2004-11-084-2/+92
|/ / /
* | | merge with 4.1monty@mysql.com2004-10-2959-738/+1585
|\ \ \ | |/ /
| * | Fixed access to freed memorymonty@mysql.com2004-10-271-2/+0
| * | Merge with 4.0monty@mysql.com2004-10-273-0/+27
| |\ \ | | |/
| | * Backport innodb_max_purge_lag from 4.1marko@hundin.mysql.fi2004-10-276-1/+73
| * | fil0fil.c:heikki@hundin.mysql.fi2004-10-261-0/+10
| * | row0mysql.c:heikki@hundin.mysql.fi2004-10-263-14/+40
| * | - fixed typo in innobase/os/os0file.c that caused the Windows build to faillenz@mysql.com2004-10-251-1/+1
| * | Fix compiler warnings (detected by Intel's C++ compiler)monty@mysql.com2004-10-222-17/+15
| * | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1monty@mysql.com2004-10-223-6/+23
| |\ \ | | |/
| | * os0file.c:heikki@hundin.mysql.fi2004-10-221-4/+4
| | * row0mysql.c, row0ins.c:heikki@hundin.mysql.fi2004-10-222-2/+19
| * | SHOW TABLE STATUS now prints create_time, update_time and check_timejan@hundin.mysql.fi2004-10-212-5/+95
| * | Merge with 4.0monty@mysql.com2004-10-201-12/+18
| |\ \ | | |/
| | * trx0rec.c:heikki@hundin.mysql.fi2004-10-191-1/+1
| | * trx0rec.c:heikki@hundin.mysql.fi2004-10-091-12/+18
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-10-203-13/+26
| |\ \
| | * \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-10-083-13/+26
| | |\ \
| | | * \ Mergemonty@mysql.com2004-10-083-13/+26
| | | |\ \ | | | | |/
| | | | * InnoDB: tolerate system clock glitches a little bettermarko@hundin.mysql.fi2004-10-073-13/+26
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2004-10-201-0/+13
| |\ \ \ \
| | * | | | Review of all code pushed since last reviewmonty@mishka.local2004-10-201-0/+13
| * | | | | os0file.c:heikki@hundin.mysql.fi2004-10-191-0/+5
| * | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1marko@hundin.mysql.fi2004-10-193-90/+36
| |\ \ \ \ \
| | * | | | | InnoDB: Treat UTF-8 strings properly in case insensitive operationsmarko@hundin.mysql.fi2004-10-183-90/+36
| * | | | | | srv0srv.c:heikki@hundin.mysql.fi2004-10-181-1/+7
| |/ / / / /
| * | | | | Use already parsed SQL-query in the current thread when determiningjan@hundin.mysql.fi2004-10-151-10/+12
| * | | | | This patch removes unnecessary lock from the supremum record, takesjan@hundin.mysql.fi2004-10-144-34/+37
| |/ / / /
| * | | | srv0srv.c, log0log.c, srv0srv.h, ha_innodb.cc, ha_innodb.h:heikki@hundin.mysql.fi2004-10-133-13/+54
| * | | | InnoDB: correct potential overflow in trx_purge()marko@hundin.mysql.fi2004-10-131-2/+5
| * | | | row0mysql.c:heikki@hundin.mysql.fi2004-10-081-3/+15
| |/ / /
| * | | row0sel.c, row0row.c:heikki@hundin.mysql.fi2004-10-082-19/+30
| * | | Many files:heikki@hundin.mysql.fi2004-10-0711-44/+124
| |/ /