summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Expand)AuthorAgeFilesLines
* manual mergeserg@serg.mylan2004-07-2013-56/+138
|\
| * manual merged (blame me!)serg@serg.mylan2004-07-2013-56/+138
| |\
| | * InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADEmarko@hundin.mysql.fi2004-07-151-13/+65
| | * btr0cur.c:heikki@hundin.mysql.fi2004-07-151-2/+9
| | * lock0lock.c:marko@hundin.mysql.fi2004-07-131-8/+6
| | * InnoDB: LOCK TABLES clean-up, part 2marko@hundin.mysql.fi2004-07-121-2/+4
| | * InnoDB: LOCK TABLE clean-upmarko@hundin.mysql.fi2004-07-126-28/+34
| | * InnoDB: Increment the lock wait watchdog timeout during CHECK TABLEmarko@hundin.mysql.fi2004-07-125-7/+23
| | * srv0start.c:marko@hundin.mysql.fi2004-07-121-1/+1
* | | Merge with 4.1.3-betamonty@mysql.com2004-07-0798-1620/+2072
|\ \ \ | |/ /
| * | Merge with 4.0 to get the latest bug patches to 4.1monty@mysql.com2004-06-257-120/+170
| |\ \ | | |/
| | * lexyy.c, pars0lex.l:marko@hundin.mysql.fi2004-06-222-113/+158
| | * Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-06-211-1/+2
| | |\
| | | * mem0dbg.c:heikki@hundin.mysql.fi2004-06-191-1/+2
| | * | mach0data.ic, mach0data.h:marko@hundin.mysql.fi2004-06-184-7/+11
| | |/
| * | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1guilhem@mysql.com2004-06-232-10/+36
| |\ \
| | * | Robustness feature.guilhem@mysql.com2004-06-202-10/+36
| * | | mergemonty@mysql.com2004-06-2175-442/+955
| |\ \ \ | | |/ / | |/| |
| | * | After merge fixesmonty@mysql.com2004-06-213-4/+1
| | * | Merge with 4.0.21monty@mysql.com2004-06-1874-439/+954
| | |\ \ | | | |/
| | | * mem0dbg.h, mem0dbg.c:heikki@hundin.mysql.fi2004-06-172-0/+138
| | | * que0que.c, srv0que.c:heikki@hundin.mysql.fi2004-06-172-0/+6
| | | * log0recv.c:heikki@hundin.mysql.fi2004-06-171-1/+3
| | | * log0log.h:heikki@hundin.mysql.fi2004-06-174-61/+3
| | | * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040316101802|63386heikki@hundin.mysql.fi2004-06-173-3/+35
| | | * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613heikki@hundin.mysql.fi2004-06-1714-70/+81
| | | * srv0que.c:heikki@hundin.mysql.fi2004-06-172-0/+164
| | | * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870heikki@hundin.mysql.fi2004-06-1712-101/+338
| | | * ut0mem.c:heikki@hundin.mysql.fi2004-06-161-7/+0
| | | * ut0mem.h, ut0mem.c:heikki@hundin.mysql.fi2004-06-164-18/+131
| | | * mem0mem.ic, mem0mem.h:heikki@hundin.mysql.fi2004-06-162-41/+0
| | | * InnoDB bug fix: mem_realloc() didn't preserve the block contentsmarko@hundin.mysql.fi2004-06-161-3/+15
| | | * InnoDB: Revert most of ChangeSet@1.1772, as the debug functions maymarko@hundin.mysql.fi2004-06-1636-140/+23
| | | * InnoDB bug fix (row0mysql.c): make reserved table names innodb_* special againmarko@hundin.mysql.fi2004-06-151-17/+33
| | | * InnoDB cleanup: Remove debug functionmarko@hundin.mysql.fi2004-06-021-2/+6
| | * | Fixed some byte order bugs with prepared statements on machines with high-byt...monty@mysql.com2004-06-181-1/+1
| * | | fil0fil.c:heikki@hundin.mysql.fi2004-06-171-5/+4
| * | | row0ins.c:heikki@hundin.mysql.fi2004-06-161-8/+10
| * | | InnoDB: fix bug in call to innobase_invalidate_query_cache(),marko@hundin.mysql.fi2004-06-162-14/+12
| |/ /
| * | Portability fixes (and a typo after last merge)monty@mysql.com2004-06-041-1/+1
| * | fil0fil.c:heikki@hundin.mysql.fi2004-06-031-11/+11
| * | os0file.c, fil0fil.c:heikki@hundin.mysql.fi2004-06-032-35/+54
| * | fil0fil.c:heikki@hundin.mysql.fi2004-06-021-2/+2
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-06-021-4/+45
| |\ \
| | * | fil0fil.c:heikki@hundin.mysql.fi2004-06-021-4/+45
| * | | after merge fixesmonty@mysql.com2004-06-021-8/+8
| * | | Merge with 4.0 to get fixes for netwaremonty@mysql.com2004-06-026-16/+43
| |\ \ \ | | |/ / | |/| / | | |/
| | * row0mysql.c, row0mysql.h, ha_innodb.cc:heikki@hundin.mysql.fi2004-06-012-0/+4
| | * InnoDB: Add diagnostics when tmpfile() fails at start (Bug #3919)marko@hundin.mysql.fi2004-05-284-16/+39
| * | InnoDB: os0file.c:marko@hundin.mysql.fi2004-06-011-16/+10
View Lorry Controller Status