summaryrefslogtreecommitdiff
path: root/innobase/include
Commit message (Expand)AuthorAgeFilesLines
* manually mergedserg@serg.mylan2004-08-188-9/+61
|\
| * srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:heikki@hundin.mysql.fi2004-08-182-2/+36
| * InnoDB: Use create_temp_file() when availablemarko@hundin.mysql.fi2004-08-101-2/+2
| * InnoDB: Add option for disabling innodb_status.<pid> files.marko@hundin.mysql.fi2004-08-062-1/+3
| * dyn0dyn.h:marko@hundin.mysql.fi2004-08-023-3/+6
| * row0sel.c, page0page.ic:heikki@hundin.mysql.fi2004-07-301-1/+6
| * row0sel.c, page0page.ic:heikki@hundin.mysql.fi2004-07-271-1/+9
* | Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2004-07-211-0/+1
|\ \
| * | Added innodb_locks_unsafe_for_binlog option. This option turns off Innodb jan@hundin.mysql.fi2004-07-201-0/+1
* | | manual merged (blame me!)serg@serg.mylan2004-07-205-8/+12
|\ \ \ | |/ / |/| / | |/
| * InnoDB: LOCK TABLE clean-upmarko@hundin.mysql.fi2004-07-123-7/+10
| * InnoDB: Increment the lock wait watchdog timeout during CHECK TABLEmarko@hundin.mysql.fi2004-07-122-1/+2
* | Merge with 4.0 to get the latest bug patches to 4.1monty@mysql.com2004-06-254-7/+11
|\ \ | |/
| * 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-231-0/+8
|\ \
| * | Robustness feature.guilhem@mysql.com2004-06-201-0/+8
* | | Merge with 4.0.21monty@mysql.com2004-06-1835-144/+246
|\ \ \ | |/ / |/| / | |/
| * mem0dbg.h, mem0dbg.c:heikki@hundin.mysql.fi2004-06-171-0/+13
| * log0log.h:heikki@hundin.mysql.fi2004-06-172-6/+0
| * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040316101802|63386heikki@hundin.mysql.fi2004-06-172-0/+34
| * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613heikki@hundin.mysql.fi2004-06-177-39/+36
| * srv0que.c:heikki@hundin.mysql.fi2004-06-171-0/+53
| * Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870heikki@hundin.mysql.fi2004-06-175-20/+62
| * ut0mem.h, ut0mem.c:heikki@hundin.mysql.fi2004-06-161-0/+31
| * 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-1617-49/+16
* | Merge with 4.0 to get fixes for netwaremonty@mysql.com2004-06-022-0/+10
|\ \ | |/
| * row0mysql.c, row0mysql.h, ha_innodb.cc:heikki@hundin.mysql.fi2004-06-011-0/+3
| * InnoDB: Add diagnostics when tmpfile() fails at start (Bug #3919)marko@hundin.mysql.fi2004-05-281-0/+7
* | InnoDB cleanup:marko@hundin.mysql.fi2004-05-277-17/+31
* | merge with 4.0 to get windows fixesmonty@mysql.com2004-05-273-81/+2
|\ \ | |/
| * InnoDB cleanup: Remove unused code for online backupmarko@hundin.mysql.fi2004-05-263-81/+2
* | Changed prototype of killed_ptr() to make it more portablemonty@mysql.com2004-05-261-0/+4
* | merge with 4.0 to get Netware patches and fixes for libmysqld.dllmonty@mysql.com2004-05-256-115/+20
|\ \ | |/
| * InnoDB cleanup and possible bug-fix: Remove srv0quemarko@hundin.mysql.fi2004-05-256-115/+20
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-05-247-376/+3
|\ \
| * | After merge fixesmonty@mysql.com2004-05-242-3/+1
| * | Merge with 4.0, mainly to get changes to windows project filesmonty@mysql.com2004-05-205-373/+2
| |\ \ | | |/
| | * InnoDB: Remove unused module sync0ipmmarko@hundin.mysql.fi2004-05-173-296/+1
| | * InnoDB: Remove unused module os0shmmarko@hundin.mysql.fi2004-05-173-77/+1
* | | InnoDB cleanup: Remove unused functions ut_sprintf() and ut_fprintf()marko@hundin.mysql.fi2004-05-201-32/+0
|/ /
* | InnoDB cleanup: Add const qualifiers to many char* argumentsmarko@hundin.mysql.fi2004-05-1719-271/+283
* | Merge with 4.0.20monty@mysql.com2004-05-171-2/+4
|\ \ | |/
| * InnoDB: Remove unused function ut_str_catenate()marko@hundin.mysql.fi2004-05-141-11/+0
| * ha_innodb.cc, trx0trx.h, lock0lock.c, trx0trx.c:heikki@hundin.mysql.fi2004-05-131-2/+4
* | InnoDB cleanup: eliminate IB__FILE__marko@hundin.mysql.fi2004-05-1415-166/+163
* | InnoDB: ut0mem: Remove ut_str_catenate(), add const qualifiersmarko@hundin.mysql.fi2004-05-142-22/+11
* | InnoDB: Replace ut_strdup() with mem_strdup()marko@hundin.mysql.fi2004-05-111-10/+0
* | Merge with 4.0 to get security patch for check_grant_colummonty@mysql.com2004-05-061-0/+8
|\ \ | |/