summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Expand)AuthorAgeFilesLines
* manually mergedunknown2004-08-1819-36/+265
|\
| * srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:unknown2004-08-185-9/+66
| * row0mysql.c:unknown2004-08-131-0/+24
| * os0file.c:unknown2004-08-101-2/+3
| * InnoDB: Use create_temp_file() when availableunknown2004-08-102-22/+54
| * InnoDB: Add option for disabling innodb_status.<pid> files.unknown2004-08-067-17/+51
| * dyn0dyn.h:unknown2004-08-023-3/+6
| * Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-07-302-2/+13
| |\
| | * row0sel.c, page0page.ic:unknown2004-07-302-2/+13
| * | dict0crea.c:unknown2004-07-301-0/+1
| |/
| * buf0flu.c, os0file.c:unknown2004-07-272-0/+57
| * row0sel.c, page0page.ic:unknown2004-07-272-1/+10
* | InnoDB: Make UNIV_LOG_DEBUG workunknown2004-08-112-2/+13
* | row0mysql.c:unknown2004-08-091-1/+0
* | fil0fil.c:unknown2004-07-301-0/+2
* | Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1unknown2004-07-213-7/+81
|\ \
| * | Added innodb_locks_unsafe_for_binlog option. This option turns off Innodb unknown2004-07-203-7/+81
* | | manual merged (blame me!)unknown2004-07-2013-56/+138
|\ \ \ | |/ / |/| / | |/
| * InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADEunknown2004-07-151-13/+65
| * btr0cur.c:unknown2004-07-151-2/+9
| * lock0lock.c:unknown2004-07-131-8/+6
| * InnoDB: LOCK TABLES clean-up, part 2unknown2004-07-121-2/+4
| * InnoDB: LOCK TABLE clean-upunknown2004-07-126-28/+34
| * InnoDB: Increment the lock wait watchdog timeout during CHECK TABLEunknown2004-07-125-7/+23
| * srv0start.c:unknown2004-07-121-1/+1
* | Merge with 4.0 to get the latest bug patches to 4.1unknown2004-06-257-120/+170
|\ \ | |/
| * lexyy.c, pars0lex.l:unknown2004-06-222-113/+158
| * Merge marko@build.mysql.com:/home/bk/mysql-4.0unknown2004-06-211-1/+2
| |\
| | * mem0dbg.c:unknown2004-06-191-1/+2
| * | mach0data.ic, mach0data.h:unknown2004-06-184-7/+11
| |/
* | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-06-232-10/+36
|\ \
| * | Robustness feature.unknown2004-06-202-10/+36
* | | mergeunknown2004-06-2175-442/+955
|\ \ \ | |/ / |/| |
| * | After merge fixesunknown2004-06-213-4/+1
| * | Merge with 4.0.21unknown2004-06-1874-439/+954
| |\ \ | | |/
| | * mem0dbg.h, mem0dbg.c:unknown2004-06-172-0/+138
| | * que0que.c, srv0que.c:unknown2004-06-172-0/+6
| | * log0recv.c:unknown2004-06-171-1/+3
| | * log0log.h:unknown2004-06-174-61/+3
| | * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040316101802|63386unknown2004-06-173-3/+35
| | * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613unknown2004-06-1714-70/+81
| | * srv0que.c:unknown2004-06-172-0/+164
| | * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870unknown2004-06-1712-101/+338
| | * ut0mem.c:unknown2004-06-161-7/+0
| | * ut0mem.h, ut0mem.c:unknown2004-06-164-18/+131
| | * mem0mem.ic, mem0mem.h:unknown2004-06-162-41/+0
| | * InnoDB bug fix: mem_realloc() didn't preserve the block contentsunknown2004-06-161-3/+15
| | * InnoDB: Revert most of ChangeSet@1.1772, as the debug functions mayunknown2004-06-1636-140/+23
| | * InnoDB bug fix (row0mysql.c): make reserved table names innodb_* special againunknown2004-06-151-17/+33
| | * InnoDB cleanup: Remove debug functionunknown2004-06-021-2/+6