Merge "(bug 37020) sql.php with readline eats semicolon"