summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@narttu.mysql.fi2003-03-171-1/+1
|\
| * Preparing to client<->server autoconvertbar@bar.mysql.r18.ru2003-03-171-1/+1
* | Merge with 4.0monty@narttu.mysql.fi2003-03-161-4/+28
|\ \ | |/ |/|
| * ha_innodb.cc:heikki@hundin.mysql.fi2003-03-131-0/+10
| * ha_innodb.cc:heikki@hundin.mysql.fi2003-03-041-0/+4
| * ha_innodb.cc:heikki@hundin.mysql.fi2003-03-041-4/+1
| * ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, sql_class.cc:heikki@hundin.mysql.fi2003-03-031-0/+13
* | Merge with 4.0monty@narttu.mysql.fi2003-02-271-4/+13
|\ \ | |/
| * ha_innodb.cc:heikki@hundin.mysql.fi2003-02-261-1/+7
| * ha_innodb.cc:heikki@hundin.mysql.fi2003-02-261-3/+6
| * ha_innodb.cc:heikki@hundin.mysql.fi2003-02-181-2/+8
| * page0cur.c:heikki@hundin.mysql.fi2003-02-181-2/+2
* | ha_innodb.cc:heikki@hundin.mysql.fi2003-02-181-0/+1
* | mergemonty@mashka.mysql.fi2003-02-081-11/+8
|\ \ | |/
| * ha_innodb.cc:heikki@hundin.mysql.fi2003-02-071-11/+8
* | Merge with 4.0 to get fix for MIN/MAXmonty@mashka.mysql.fi2003-02-071-4/+23
|\ \ | |/
| * ha_innodb.cc:heikki@hundin.mysql.fi2003-02-071-1/+12
| * ha_innodb.cc:heikki@hundin.mysql.fi2003-02-051-3/+11
* | Merge with 4.0.11monty@mashka.mysql.fi2003-02-041-4/+20
|\ \ | |/
| * Merge work:/home/bk/mysql-4.0serg@serg.mysql.com2003-01-301-1/+1
| |\
| | * low-level error messages cleanupserg@serg.mysql.com2003-01-281-1/+1
| * | ha_innodb.cc:heikki@hundin.mysql.fi2003-01-291-9/+4
| * | ha_innodb.cc:heikki@hundin.mysql.fi2003-01-291-3/+13
| |/
| * Fixes for Netwaremonty@mashka.mysql.fi2003-01-281-0/+1
| * ha_innodb.cc:heikki@hundin.mysql.fi2003-01-211-0/+10
* | ha_innodb.cc:heikki@hundin.mysql.fi2003-01-241-4/+17
* | Mergemonty@mashka.mysql.fi2003-01-211-1/+0
|\ \
| * | Portability fixes (for windows)monty@mashka.mysql.fi2003-01-211-1/+0
* | | Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1hf@deer.mysql.r18.ru2003-01-211-5/+0
|\ \ \
| * | | ha_innodb.cc:heikki@hundin.mysql.fi2003-01-201-5/+0
| |/ /
* | | Conflicts resolvinghf@deer.mysql.r18.ru2003-01-201-49/+147
|\ \ \ | |/ /
| * | Merge with 4.0.9monty@mashka.mysql.fi2003-01-181-49/+147
| |\ \ | | |/
| | * ha_innodb.cc:heikki@hundin.mysql.fi2003-01-171-13/+1
| | * ha_innodb.cc:heikki@hundin.mysql.fi2003-01-161-2/+5
| | * ha_innodb.cc:heikki@hundin.mysql.fi2003-01-161-7/+30
| | * ha_innodb.cc:heikki@hundin.mysql.fi2003-01-161-1/+1
| | * ha_innodb.cc:heikki@hundin.mysql.fi2003-01-161-27/+105
| | * trx0trx.c:heikki@hundin.mysql.fi2003-01-121-3/+6
* | | resolving conflictshf@deer.mysql.r18.ru2003-01-151-26/+71
|\ \ \ | |/ /
| * | ha_innodb.cc:heikki@hundin.mysql.fi2003-01-131-1/+9
| * | ut0mem.c, row0sel.c, row0mysql.c, ut0mem.h, row0sel.h, row0mysql.h:heikki@hundin.mysql.fi2003-01-121-11/+23
| * | buf0buf.c, buf0buf.ic, buf0buf.h:heikki@hundin.mysql.fi2003-01-061-2/+21
| * | Merge with 4.0.8monty@mashka.mysql.fi2003-01-031-12/+18
| |\ \ | | |/
| | * Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0monty@mashka.mysql.fi2003-01-021-4/+2
| | |\
| | | * ha_innodb.cc:heikki@hundin.mysql.fi2002-12-311-4/+2
| | * | Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overrunsmonty@mashka.mysql.fi2002-12-261-6/+3
| | |/
| | * Merge with 3.23:monty@mashka.mysql.fi2002-12-211-1/+8
| | * Merge with 3.23monty@mashka.mysql.fi2002-12-111-1/+5
* | | SCRUMhf@deer.mysql.r18.ru2003-01-151-2/+2
* | | Merginghf@deer.mysql.r18.ru2002-12-161-0/+2
|\ \ \ | |/ / |/| |