Merge "Fix undefined getDelimiter() call in sql.php"