innodb-zip.test: Now that innodb_file_per_table is a settable variable

as of r2355, remove the special startup options innodb-zip-master.opt
and set the variable in innodb-zip.test instead.

mysql-test/innodb-zip-master.opt

---innodb_file_per_table
\ No newline at end of file

mysql-test/innodb-zip.result

+set global innodb_file_per_table=1;
 create table t1(a int not null, b text, index(b(10))) engine=innodb
 key_block_size=1;
 insert into t1 values (1,1);
@@ -12,3 +13,4 @@ select a,left(b,40),b=1 is_equal from t1;
 a	left(b,40)	is_equal
 1	1	1
 drop table t1;
+set global innodb_file_per_table=0;

mysql-test/innodb-zip.test

 -- source include/have_innodb.inc
 
+let $default=`select @@innodb_file_per_table`;
+set global innodb_file_per_table=1;
 create table t1(a int not null, b text, index(b(10))) engine=innodb
 key_block_size=1;
 
@@ -29,3 +31,4 @@ disconnect a;
 disconnect b;
 
 drop table t1;
+eval set global innodb_file_per_table=$default;