sync with patches rev10

include/univ.i

@@ -12,7 +12,7 @@ Created 1/20/1994 Heikki Tuuri
 #define INNODB_VERSION_MAJOR	1
 #define INNODB_VERSION_MINOR	0
 #define INNODB_VERSION_BUGFIX	2
-#define PERCONA_INNODB_VERSION	-1
+#define PERCONA_INNODB_VERSION	1
 
 /* The following is the InnoDB version as shown in
 SELECT plugin_version FROM information_schema.plugins;
@@ -24,7 +24,7 @@ component, i.e. we show M.N.P as M.N */
 	(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
 
 /* auxiliary macros to help creating the version as string */
-#define __INNODB_VERSION(a, b, c, d)	(#a "." #b "." #c "." #d)
+#define __INNODB_VERSION(a, b, c, d)	(#a "." #b "." #c "-" #d)
 #define _INNODB_VERSION(a, b, c, d)	__INNODB_VERSION(a, b, c, d)
 
 #define INNODB_VERSION_STR			\

make_storage.sh

-rm -fr $1/storage/innobase/*
-cp -r * $1/storage/innobase/

mysql-test/innodb-index-master.opt

---innodb_lock_wait_timeout=1

srv/srv0srv.c

@@ -2390,7 +2390,7 @@ loop:
 			+ log_sys->n_pending_writes;
 		n_ios = log_sys->n_log_ios + buf_pool->n_pages_read
 			+ buf_pool->n_pages_written;
-		if (n_pend_ios < 3 && (n_ios - n_ios_old < 5)) {
+		if (n_pend_ios < 3 && (n_ios - n_ios_old < PCT_IO(5))) {
 			srv_main_thread_op_info = "doing insert buffer merge";
 			ibuf_contract_for_n_pages(
 				TRUE, PCT_IO((srv_insert_buffer_batch_size / 4)));