automerge

mysql-test/t/distinct.test

@@ -490,6 +490,7 @@ default NULL);
 SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE 
 '../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
 LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
+--error 0,1
 --remove_file $MYSQL_TEST_DIR/var/tmp/data1.tmp
 
 SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE