joerg@mysql.com
6eb8bf620b
storage/innobase/Makefile.am :
...
Restore "make dist" for the header files in "storage/innobase/include".
2005-12-16 12:45:43 +01:00
aivanov@mysql.com
124b76c5a8
Changes from the innodb-5.1-ss28 snapshot.
...
Removed include/Makefile.am and the reference to it.
Deleted db/db0err.h and db directory.
Check index column sizes in a better way (bug 13315).
Fixed comments for memory allocation functions and added
some extra checks. Adapted callers.
2005-12-13 16:49:24 +03:00
aivanov@mysql.com
141805f9c8
The innodb-5.0-ss52 snapshot changes were erroneously auto-merged
...
to 5.1. Undoing the merge.
2005-12-08 15:00:18 +03:00
jimw@mysql.com
bc4e6f822b
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-06 18:27:39 -08:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
tomas@poseidon.ndb.mysql.com
e72fdf5619
Merge
2005-10-07 01:12:46 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
osku@127.(none)
89e8df28ec
Merge 127.(none):/home/osku/mysql/5.0/12084
...
into 127.(none):/home/osku/mysql/5.1/clean
2005-09-08 11:36:11 +03:00
ndbdev@dl145c.mysql.com
f40c1576b0
Merge
2005-09-06 09:20:15 +02:00
brian@zim.(none)
57403ddc9d
Merge zim.(none):/home/brian/mysql/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.1
Resolved to minor issues.
2005-08-30 14:40:02 -07:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
ndbdev@dl145b.mysql.com
e4c53b737e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-22 02:56:25 +02:00
tomas@poseidon.ndb.mysql.com
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
ndbdev@dl145b.mysql.com
dcef1c7532
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-22 19:07:29 +02:00
tulin@dl145b.mysql.com
b4f774f62b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-21 15:14:21 +02:00
tulin@dl145b.mysql.com
a6d0581275
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-21 08:49:21 +02:00
ndbdev@dl145b.mysql.com
8d3a587453
Merge dl145c:tomas/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-17 14:22:33 +02:00
joreland@mysql.com
84a04b4a9d
merge
2005-06-13 14:09:09 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09
Merge
2005-05-31 14:37:47 +02:00
tulin@dl145c.mysql.com
23f79bd1f2
merge
2005-05-17 10:17:53 +02:00
lars@mysql.com
05cbb3962c
Manual merge 5.0->5.1
2005-05-06 15:04:07 +02:00
tomas@poseidon.ndb.mysql.com
145ae3c6f5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-02 13:18:26 +02:00
brian@zim.(none)
3e4607a3b8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/mysql-5.1
2005-04-26 19:07:13 -07:00
brian@zim.(none)
2193fd8666
All changes for change to all storage engines being under storage directory.
2005-04-26 19:04:36 -07:00
brian@zim.(none)
2a7c71e309
Changes to create storage directory for storage engines.
2005-04-26 18:19:54 -07:00