merge with 3.23

BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Docs/manual.texi:
  Auto merged
client/client_priv.h:
  Auto merged
extra/resolveip.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/ha_innobase.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
client/mysqldump.c:
  Use local version in 4.0
configure.in:
  Use 4.0 code

innobase/os/os0file.c

@@ -581,6 +581,13 @@ os_file_flush(
 		return(TRUE);
 	}
 	
+	/* Since Linux returns EINVAL if the 'file' is actually a raw device,
+	we choose to ignore that error */
+
+	if (errno == EINVAL) {
+	        return(TRUE);
+	}
+
 	fprintf(stderr,
 		"InnoDB: Error: the OS said file flush did not succeed\n");