From c5e01f84ad48c5c626001cb92d7a95500920a900 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Mon, 21 Jan 2019 18:48:51 +0100 Subject: [PATCH] Actually set MYSQLI_OPT_LOCAL_INFILE 1e6b740e tried to set this but failed due to https://bugs.php.net/77496 and nobody probably ever tested it. Tested: Executed `LOAD DATA LOCAL INFILE 'README' INTO TABLE text(text)` SQL command successfully before, unsuceesfully after. Signed-off-by: Jakub Vrana --- libraries/classes/Dbi/DbiMysqli.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/classes/Dbi/DbiMysqli.php b/libraries/classes/Dbi/DbiMysqli.php index f6fc5694d9..3833f846a4 100644 --- a/libraries/classes/Dbi/DbiMysqli.php +++ b/libraries/classes/Dbi/DbiMysqli.php @@ -88,12 +88,6 @@ class DbiMysqli implements DbiExtension $link = mysqli_init(); - if (defined('PMA_ENABLE_LDI')) { - mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, true); - } else { - mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, false); - } - $client_flags = 0; /* Optionally compress connection */ @@ -175,6 +169,12 @@ class DbiMysqli implements DbiExtension return false; } + if (defined('PMA_ENABLE_LDI')) { + mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, true); + } else { + mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, false); + } + return $link; }