summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Expand)AuthorAgeFilesLines
* pars0lex.l:marko@hundin.mysql.fi2005-06-172-1/+7
* os0sync.c, os0file.c:heikki@hundin.mysql.fi2005-06-102-12/+12
* mergedserg@serg.mylan2005-05-281-0/+5
|\
| * Merge hundin.mysql.fi:/home/marko/k/mysql-4.0marko@hundin.mysql.fi2005-05-261-0/+5
| |\
| | * InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335).marko@hundin.mysql.fi2005-05-261-0/+5
* | | srv0start.c:marko@hundin.mysql.fi2005-05-251-3/+4
* | | Print information about XA recovery only if there are prepared XA transactionsjan@hundin.mysql.fi2005-05-241-7/+11
* | | Manual merge (again)konstantin@mysql.com2005-05-141-2/+10
|\ \ \ | |/ /
| * | row0mysql.c:heikki@hundin.mysql.fi2005-05-131-2/+10
* | | After merge fixmarko@hundin.mysql.fi2005-05-061-0/+3
* | | Mergemarko@hundin.mysql.fi2005-05-064-22/+61
|\ \ \ | |/ /
| * | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1marko@hundin.mysql.fi2005-05-064-20/+61
| |\ \
| | * | InnoDB: Truncate SHOW INNODB STATUS output at the start of the listmarko@hundin.mysql.fi2005-04-194-20/+61
* | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.1heikki@hundin.mysql.fi2005-04-273-1/+27
|\ \ \ \ | |/ / /
| * | | dict0dict.c, dict0dict.h, fil0fil.c:heikki@hundin.mysql.fi2005-04-273-1/+27
| |/ /
| * | Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).jan@hundin.mysql.fi2005-04-181-18/+23
* | | Adding --innodb_fast_shutdown=2 which shuts down InnoDB faster than the defau...gbichot@quadita2.mysql.com2005-04-154-20/+26
* | | Merge hundin.mysql.fi:/home/heikki/mysql-4.1heikki@hundin.mysql.fi2005-04-141-19/+51
|\ \ \ | |/ /
| * | fil0fil.c:heikki@hundin.mysql.fi2005-04-141-19/+51
* | | Merge from 4.1jimw@mysql.com2005-04-132-13/+14
|\ \ \ | |/ /
| * | fil0fil.c:heikki@hundin.mysql.fi2005-04-131-1/+2
| * | row0sel.c:heikki@hundin.mysql.fi2005-04-131-12/+12
* | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-04-135-18/+30
|\ \ \
| * \ \ Mergemskold@mysql.com2005-04-135-18/+30
| |\ \ \ | | |/ /
| | * | InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLEmarko@hundin.mysql.fi2005-04-125-18/+30
* | | | row0sel.c:heikki@hundin.mysql.fi2005-04-131-10/+17
* | | | Fixed a bug where next-key locking doesn't allow the insert which does jan@hundin.mysql.fi2005-04-131-0/+14
|/ / /
* | | manually mergedserg@serg.mylan2005-04-067-5/+57
|\ \ \ | |/ /
| * | InnoDB: Avoid test suite failures caused by a locking conflictmarko@hundin.mysql.fi2005-04-063-4/+30
| * | row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h:heikki@hundin.mysql.fi2005-04-064-1/+27
* | | Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0joerg@mysql.com2005-04-061-0/+3
|\ \ \ | |/ /
| * | dict0dict.c:heikki@hundin.mysql.fi2005-04-051-0/+3
* | | InnoDB: Disable an assertion that fails on old data due to Bug #9526marko@hundin.mysql.fi2005-04-051-1/+3
* | | ha_innodb.cc, row0sel.c:heikki@hundin.mysql.fi2005-04-041-2/+6
* | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-03-222-1/+15
|\ \ \
| * \ \ Merge hundin.mysql.fi:/home/heikki/mysql-4.1heikki@hundin.mysql.fi2005-03-212-1/+15
| |\ \ \ | | |/ /
| | * | trx0trx.c:heikki@hundin.mysql.fi2005-03-211-1/+9
| | * | Mergeheikki@hundin.mysql.fi2005-03-211-0/+6
| | |\ \ | | | |/
| | | * trx0trx.c, trx0trx.h:heikki@hundin.mysql.fi2005-03-212-1/+15
* | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-03-181-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Automergeserg@serg.mylan2005-03-171-2/+3
| |\ \ \
| | * \ \ mergedserg@serg.mylan2005-03-161-2/+3
| | |\ \ \
| | | * | | sql/ha_innodb.ccserg@serg.mylan2005-03-161-2/+3
* | | | | | data0type.h:heikki@hundin.mysql.fi2005-03-181-1/+3
* | | | | | data0type.ic:heikki@hundin.mysql.fi2005-03-181-2/+4
* | | | | | data0type.ic:heikki@hundin.mysql.fi2005-03-171-2/+1
* | | | | | data0type.ic:heikki@hundin.mysql.fi2005-03-171-1/+2
|/ / / / /
* | | | | data0data.c:heikki@hundin.mysql.fi2005-03-161-3/+1
|/ / / /
* | | | data0type.h, row0sel.c:heikki@hundin.mysql.fi2005-03-162-14/+31
* | | | DATA_MYSQL_TRUE_VARCHAR can be DATA_VARCHAR, DATA_BINARY, or jan@hundin.mysql.fi2005-03-161-2/+2
View Lorry Controller Status