← Back to branch summary

~tsarev/percona-server/12952_fix

« back to all changes in this revision

Viewing changes to patches/mysql-test.diff

  • Committer: Stewart Smith
  • Date: 2011-08-12 19:02:28 UTC
  • mfrom: (271.3.1 5.1)
  • Revision ID: stewart@flamingspork.com-20110812190228-vueumrhvouktgmqh
merge func_str repeatable fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/mysql-test.diff
3929
3929
+  open(FILE, '>', $log_error);
3930
3930
+  close(FILE);
3931
3931
 EOF
 
3932
--- a/mysql-test/t/func_str.test
 
3933
+++ b/mysql-test/t/func_str.test
 
3934
@@ -1377,6 +1377,7 @@
 
3935
 SELECT 'aaaaaaaaaaaaaa' INTO OUTFILE 'bug58165.txt';
 
3936
 SELECT insert( substring_index( 'a', 'a', 'b' ), 1, 0, 'x' );
 
3937
 LOAD DATA INFILE 'bug58165.txt' INTO TABLE t1;
 
3938
+--remove_file $MYSQLTEST_VARDIR/mysqld.1/data/test/bug58165.txt
 
3939
 SELECT * FROM t1;
 
3940
 DROP TABLE t1;
 
3941
 
 
3942
--- a/mysql-test/t/loaddata.test
 
3943
+++ b/mysql-test/t/loaddata.test
 
3944
@@ -638,6 +638,7 @@
 
3945
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 
3946
 --error ER_CANT_CREATE_GEOMETRY_OBJECT
 
3947
 --eval LOAD DATA INFILE '$file' INTO TABLE t1
 
3948
+--remove_file $MYSQLTEST_VARDIR/tmp/bug11735141.txt
 
3949
 drop table t1;
 
3950
 
 
3951
 --echo End of 5.1 tests