Merge from innodb-branches-zip

e351c94a · Vasil Dimov · a4588d74 · ea028cdd · e351c94a
Commit e351c94a authored Apr 07, 2010 by Vasil Dimov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/innodb_plugin/handler/ha_innodb.cc storage/innodb_plugin/handler/ha_innodb.cc +1 -1

No files found.
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innodb_plugin/handler/ha_innodb.cc
@@ -2135,7 +2135,7 @@ mem_free_and_error:
 		}

 		sql_print_error("InnoDB: invalid value "
-				"innodb_file_format_check=%s",
+				"innodb_change_buffering=%s",
 				innobase_change_buffering);
 		goto mem_free_and_error;
 	}