summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Expand)AuthorAgeFilesLines
* Fixed unique prefix key bug for multibyte character sets (BUG #4521) for jan@hundin.mysql.fi2004-09-036-54/+86
* Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2004-09-032-18/+4
|\
| * srv0start.c:heikki@hundin.mysql.fi2004-09-021-3/+4
| * row0mysql.c:marko@hundin.mysql.fi2004-09-011-15/+0
* | Fixed unique prefix key bug for multibyte character sets (BUG #4521) for jan@hundin.mysql.fi2004-08-311-0/+31
* | Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2004-08-301-0/+2
|\ \ | |/
| * mergedserg@serg.mylan2004-08-261-0/+2
| |\
| | * buf0rea.c:heikki@hundin.mysql.fi2004-08-241-0/+2
* | | Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2004-08-1919-36/+265
|\ \ \ | |/ /
| * | manually mergedserg@serg.mylan2004-08-1819-36/+265
| |\ \ | | |/
| | * srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:heikki@hundin.mysql.fi2004-08-185-9/+66
| | * row0mysql.c:heikki@hundin.mysql.fi2004-08-131-0/+24
| | * os0file.c:marko@hundin.mysql.fi2004-08-101-2/+3
| | * InnoDB: Use create_temp_file() when availablemarko@hundin.mysql.fi2004-08-102-22/+54
| | * InnoDB: Add option for disabling innodb_status.<pid> files.marko@hundin.mysql.fi2004-08-067-17/+51
| | * dyn0dyn.h:marko@hundin.mysql.fi2004-08-023-3/+6
| | * Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-07-302-2/+13
| | |\
| | | * row0sel.c, page0page.ic:heikki@hundin.mysql.fi2004-07-302-2/+13
| | * | dict0crea.c:marko@hundin.mysql.fi2004-07-301-0/+1
| | |/
| | * buf0flu.c, os0file.c:heikki@hundin.mysql.fi2004-07-272-0/+57
| | * row0sel.c, page0page.ic:heikki@hundin.mysql.fi2004-07-272-1/+10
* | | Relaxed lock wait rules so that record lock does not need to wait for ajan@hundin.mysql.fi2004-08-172-29/+37
* | | Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2004-08-132-12/+111
|\ \ \ | |/ / |/| |
| * | This change includes optimization for a lock wait rules and a new behaviour forjan@hundin.mysql.fi2004-08-122-52/+47
| * | Take X-lock for duplicate keys in REPLACE command.jan@hundin.mysql.fi2004-08-112-11/+115
* | | InnoDB: Make UNIV_LOG_DEBUG workmarko@hundin.mysql.fi2004-08-112-2/+13
* | | row0mysql.c:marko@hundin.mysql.fi2004-08-091-1/+0
|/ /
* | fil0fil.c:marko@hundin.mysql.fi2004-07-301-0/+2
* | Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2004-07-213-7/+81
|\ \
| * | Added innodb_locks_unsafe_for_binlog option. This option turns off Innodb jan@hundin.mysql.fi2004-07-203-7/+81
* | | 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.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