Fixes for stuff seen in buildbot:

 - Fix embedded build

 - Backport disable of fallocate, it creates too short ibdata1
   when used with O_DIRECT on old kernels

 - Do not disable innodb during .deb install, we need it for
   mysql.rpl_slave_state table.

debian/dist/Debian/mariadb-server-5.5.postinst

@@ -21,7 +21,7 @@ invoke() {
   fi
 }
 
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --default-storage-engine=myisam"
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam"
 
 test_mysql_access() {
        mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1

debian/dist/Ubuntu/mariadb-server-5.5.postinst

@@ -21,7 +21,7 @@ invoke() {
   fi
 }
 
-MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --default-storage-engine=myisam"
+MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam"
 
 test_mysql_access() {
        mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1

sql/sys_vars.h

@@ -552,6 +552,7 @@ protected:
   }
 };
 
+class Master_info;
 class Sys_var_rpl_filter: public sys_var
 {
 private:

storage/innobase/handler/ha_innodb.cc

@@ -2492,7 +2492,7 @@ innobase_change_buffering_inited_ok:
 	innobase_commit_concurrency_init_default();
 
 #ifdef HAVE_POSIX_FALLOCATE
-	srv_use_posix_fallocate = (ibool) innobase_use_fallocate;
+	srv_use_posix_fallocate = 0 && (ibool) innobase_use_fallocate;
 #endif
 	srv_use_atomic_writes = (ibool) innobase_use_atomic_writes;
 	if (innobase_use_atomic_writes) {

storage/xtradb/handler/ha_innodb.cc

@@ -3082,7 +3082,7 @@ innobase_change_buffering_inited_ok:
 #endif
 
 #ifdef HAVE_POSIX_FALLOCATE
-	srv_use_posix_fallocate = (ibool) innobase_use_fallocate;
+	srv_use_posix_fallocate = 0 && (ibool) innobase_use_fallocate;
 #endif
 	srv_use_atomic_writes = (ibool) innobase_use_atomic_writes;
 	if (innobase_use_atomic_writes) {