Merged fix-821715-enable-local-infile-in-dsn

This commit is contained in:
Brian Fraser
2012-10-30 22:12:57 -03:00
14 changed files with 130 additions and 45 deletions

View File

@@ -303,7 +303,6 @@ is_deeply(
# #############################################################################
my $tmpdir = '/tmp/mk-upgrade-res';
SKIP: {
skip "LOAD DATA LOCAL INFILE is disabled", 30 unless $can_load_data;
diag(`rm -rf $tmpdir 2>/dev/null; mkdir $tmpdir`);
@@ -728,7 +727,6 @@ is_deeply(
);
SKIP: {
skip "LOAD DATA LOCAL INFILE is disabled", 2 unless $can_load_data;
$cr = new CompareResults(
method => 'rows',