summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_loaddata.c
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@lerdorf.com>2019-05-21 14:46:24 -0700
committerRasmus Lerdorf <rasmus@lerdorf.com>2019-05-21 14:46:24 -0700
commit2d29263a9ff6fc400891c0de2d8e4ae194513f57 (patch)
treef13ff26dc5aaa9d12548b7678e16a36012c542f8 /ext/mysqlnd/mysqlnd_loaddata.c
parent97ba6b0d8bbb20b0d4a4a0c950b582f6cfeeea27 (diff)
parent7b42cdf95ee91b723e7df51ac96f880de51f4591 (diff)
downloadphp-git-2d29263a9ff6fc400891c0de2d8e4ae194513f57.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
Diffstat (limited to 'ext/mysqlnd/mysqlnd_loaddata.c')
0 files changed, 0 insertions, 0 deletions