branches/zip:

Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl

Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.

Approved by:	Marko (https://svn.innodb.com/rb/r/42/)

handler/ha_innodb.cc

@@ -9708,11 +9708,15 @@ innodb_plugin_init(void)
 				/* found the corresponding parameter */
 
 				/* check if the flags are the same,
-				ignoring differences in the READONLY flag;
+				ignoring differences in the READONLY or
+				NOSYSVAR flags;
 				e.g. we are not copying string variable to
-				an integer one */
-				if (((*sta)->flags & ~PLUGIN_VAR_READONLY)
-				    != ((*dyn)->flags & ~PLUGIN_VAR_READONLY)) {
+				an integer one, but we do not care if it is
+				readonly in the static and not in the
+				dynamic */
+				if (((*sta)->flags ^ (*dyn)->flags)
+				    & ~(PLUGIN_VAR_READONLY
+					| PLUGIN_VAR_NOSYSVAR)) {
 
 					fprintf(stderr,
 						"InnoDB: %s in static InnoDB "