« back to all changes in this revision
Viewing changes to plugin/innobase/plugin.am
- Committer: Stewart Smith
- Date: 2010-11-11 06:56:57 UTC
- mto: (2021.1.2 build) (1953.1.1 build) (1819.9.64 update-innobase)
- mto: This revision was merged to the branch mainline in revision 1955.
- Revision ID: stewart@flamingspork.com-20101111065657-ndkuvs346txo8ejs
Merge initial InnoDB+ import.
This was applied by generating a patch between MySQL 5.1.50 InnoDB plugin and
the just-merged innodb+ from mysql-trunk revision-id: vasil.dimov@oracle.com-20100422110752-1zowoqxel5xx3z2e
Then, some manual merge resolving and it worked. This should make it much
easier to merge the rest of InnoDB 1.1 and 1.2 from the mysql tree using
my bzr-reapply script.
This takes us to InnoDB 1.1.1(ish).
This was applied by generating a patch between MySQL 5.1.50 InnoDB plugin and
the just-merged innodb+ from mysql-trunk revision-id: vasil.dimov@oracle.com-20100422110752-1zowoqxel5xx3z2e
Then, some manual merge resolving and it worked. This should make it much
easier to merge the rest of InnoDB 1.1 and 1.2 from the mysql tree using
my bzr-reapply script.
This takes us to InnoDB 1.1.1(ish).
- files added:
- plugin/innobase/include/os0file.ic
- files removed:
- plugin/innobase/include/srv0que.h
- files modified:
- plugin/innobase/btr/btr0btr.c
added
removed
plugin/innobase/plugin.am
