merging of code http://bazaar.launchpad.net/~mysqlatfacebook/mysqlatfacebook/5.1/revision/3415
is adding 2 parameters to the method innobase_start_trx_and_assign_read_view()
defined inside the file storage/innodb_plugin/handler/ha_innodb.cc
the same method is defined in the file storage/innobase/handler/ha_innodb.cc
with different number of parameters (2 instead of 4), preventing the system to compile
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
/bin/sh ../../libtool --preserve-dup-deps --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I../../storage/innobase/include -I../../sql -I. -DMYSQL_DYNAMIC_PLUGIN -prefer-non-pic -g -O2 -fno-implicit-templates -fno-exceptions -fno-rtti -MT ha_innodb_la-ha_innodb.lo -MD -MP -MF .deps/ha_innodb_la-ha_innodb.Tpo -c -o ha_innodb_la-ha_innodb.lo `test -f 'handler/ha_innodb.cc' || echo './'`handler/ha_innodb.cc
g++ -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I../../storage/innobase/include -I../../sql -I. -DMYSQL_DYNAMIC_PLUGIN -g -O2 -fno-implicit-templates -fno-exceptions -fno-rtti -MT ha_innodb_la-ha_innodb.lo -MD -MP -MF .deps/ha_innodb_la-ha_innodb.Tpo -c handler/ha_innodb.cc -o .libs/ha_innodb_la-ha_innodb.o
handler/ha_innodb.cc: In function int innobase_init(void*):
handler/ha_innodb.cc:1741: error: invalid conversion from int (*)(handlerton*, THD*) to int (*)(handlerton*, THD*, char*, ulonglong*)
make[2]: *** [ha_innodb_la-ha_innodb.lo] Error 1
make[2]: Leaving directory `/usr/src.ext/mysqlatfacebook_5.1-export/storage/innobase'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/usr/src.ext/mysqlatfacebook_5.1-export/storage'
make: *** [all-recursive] Error 1
We don't use or test the built-in version of innodb (storage/innobase). We test and use the plug-in version of innodb (storage/