Merge 10.0-base -> 10.0

mysql-test/include/function_defaults_notembedded.inc

@@ -92,3 +92,4 @@ FLUSH TABLE t1;
 SELECT * FROM t1;
 
 DROP TABLE t1;
+SET debug_sync = 'RESET';

mysql-test/r/function_defaults_notembedded.result

@@ -85,6 +85,7 @@ a	b
 5	1982-03-20 20:22:34
 6	1982-03-20 20:22:34
 DROP TABLE t1;
+SET debug_sync = 'RESET';
 #
 # Function defaults run 2. Six digits scale on seconds precision.
 #
@@ -169,3 +170,4 @@ a	b
 5	1982-03-20 20:22:34.876543
 6	1982-03-20 20:22:34.876543
 DROP TABLE t1;
+SET debug_sync = 'RESET';

mysql-test/suite/sys_vars/r/innodb_use_fallocate_basic.result

 select @@global.innodb_use_fallocate;
 @@global.innodb_use_fallocate
-1
+0
 select @@session.innodb_use_fallocate;
 ERROR HY000: Variable 'innodb_use_fallocate' is a GLOBAL variable
 show global variables like 'innodb_use_fallocate';
 Variable_name	Value
-innodb_use_fallocate	ON
+innodb_use_fallocate	OFF
 show session variables like 'innodb_use_fallocate';
 Variable_name	Value
-innodb_use_fallocate	ON
+innodb_use_fallocate	OFF
 select * from information_schema.global_variables where variable_name='innodb_use_fallocate';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_USE_FALLOCATE	ON
+INNODB_USE_FALLOCATE	OFF
 select * from information_schema.session_variables where variable_name='innodb_use_fallocate';
 VARIABLE_NAME	VARIABLE_VALUE
-INNODB_USE_FALLOCATE	ON
+INNODB_USE_FALLOCATE	OFF
 set global innodb_use_fallocate=1;
 ERROR HY000: Variable 'innodb_use_fallocate' is a read only variable
 set session innodb_use_fallocate=1;

storage/innobase/handler/ha_innodb.cc

@@ -2965,7 +2965,7 @@ innobase_change_buffering_inited_ok:
 	innobase_commit_concurrency_init_default();
 
 #ifdef HAVE_POSIX_FALLOCATE
-	srv_use_posix_fallocate = 0 && (ibool) innobase_use_fallocate;
+	srv_use_posix_fallocate = (ibool) innobase_use_fallocate;
 #endif
 	srv_use_atomic_writes = (ibool) innobase_use_atomic_writes;
 	if (innobase_use_atomic_writes) {
@@ -14594,7 +14594,7 @@ static MYSQL_SYSVAR_BOOL(use_atomic_writes, innobase_use_atomic_writes,
 static MYSQL_SYSVAR_BOOL(use_fallocate, innobase_use_fallocate,
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
   "Preallocate files fast, using operating system functionality. On POSIX systems, posix_fallocate system call is used.",
-  NULL, NULL, TRUE);
+  NULL, NULL, FALSE);
 
 static MYSQL_SYSVAR_ULONG(io_capacity, srv_io_capacity,
   PLUGIN_VAR_RQCMDARG,

storage/xtradb/handler/ha_innodb.cc

@@ -3082,7 +3082,7 @@ innobase_change_buffering_inited_ok:
 #endif
 
 #ifdef HAVE_POSIX_FALLOCATE
-	srv_use_posix_fallocate = 0 && (ibool) innobase_use_fallocate;
+	srv_use_posix_fallocate = (ibool) innobase_use_fallocate;
 #endif
 	srv_use_atomic_writes = (ibool) innobase_use_atomic_writes;
 	if (innobase_use_atomic_writes) {
@@ -12798,7 +12798,7 @@ static MYSQL_SYSVAR_BOOL(use_atomic_writes, innobase_use_atomic_writes,
 static MYSQL_SYSVAR_BOOL(use_fallocate, innobase_use_fallocate,
   PLUGIN_VAR_NOCMDARG | PLUGIN_VAR_READONLY,
   "Preallocate files fast, using operating system functionality. On POSIX systems, posix_fallocate system call is used.",
-  NULL, NULL, TRUE);
+  NULL, NULL, FALSE);
 
 static MYSQL_SYSVAR_ULONG(io_capacity, srv_io_capacity,
   PLUGIN_VAR_RQCMDARG,