After merge and bug fixes

- Fixed compiler warnings
- Removed have_debug.inc from innochecksum_3
- Fixed race condition in innodb_buffer_pool_load
- Fixed merge issue in innodb-bad-key-change.test
- Fixed missing array allocation that could cause
  function_defaults_notembedded to fail
- Fixed thread_cache_size_func

mysql-test/suite/encryption/t/innodb-bad-key-change.test

@@ -56,11 +56,7 @@ SELECT * FROM t1;
 
 --error ER_GET_ERRMSG
 SELECT * FROM t1;
-<<<<<<< HEAD
---replace_regex /.*tablespace [0-9]*//
-=======
 --replace_regex /tablespace [0-9]*/tablespace #/
->>>>>>> Remove end . from error messages to get them consistent
 SHOW WARNINGS;
 
 -- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keysbad3.txt