branches/zip:

Fix a mysql-test failure in innodb-zip:

main.innodb-zip                          [ fail ]
        Test ended at 2009-02-02 18:13:25

CURRENT_TEST: main.innodb-zip
mysqltest: At line 160: Found line beginning with --  that didn't contain a valid mysqltest command, check your syntax or use # if you intended to write a comment

mysql-test/innodb-zip.test

@@ -157,7 +157,8 @@ set global innodb_file_format=`1a`;
 set global innodb_file_format=``;
 
 #test strict mode.
---enable_errors
+# this does not work anymore, has been removed from mysqltest
+# -- enable_errors
 set global innodb_file_per_table = on;
 set global innodb_file_format = `1`;