diff --git a/internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/db.go b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/db.go
new file mode 100644
index 0000000000..3b320aa168
--- /dev/null
+++ b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/db.go
@@ -0,0 +1,31 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/models.go b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/models.go
new file mode 100644
index 0000000000..92ddc7826f
--- /dev/null
+++ b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/models.go
@@ -0,0 +1,13 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+
+package querytest
+
+import (
+	"database/sql"
+)
+
+type Foo struct {
+	Bar sql.NullString
+}
diff --git a/internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/query.sql.go b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/query.sql.go
new file mode 100644
index 0000000000..258d113473
--- /dev/null
+++ b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/go/query.sql.go
@@ -0,0 +1,37 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.30.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+const inlineHint = `-- name: InlineHint :one
+SELECT /*+ MAX_EXECUTION_TIME(1000) */ bar FROM foo LIMIT 1
+`
+
+func (q *Queries) InlineHint(ctx context.Context) (sql.NullString, error) {
+	row := q.db.QueryRowContext(ctx, inlineHint)
+	var bar sql.NullString
+	err := row.Scan(&bar)
+	return bar, err
+}
+
+const multilineHint = `-- name: MultilineHint :one
+SELECT
+/*+ MAX_EXECUTION_TIME(1000) */
+bar
+FROM foo
+LIMIT 1
+`
+
+func (q *Queries) MultilineHint(ctx context.Context) (sql.NullString, error) {
+	row := q.db.QueryRowContext(ctx, multilineHint)
+	var bar sql.NullString
+	err := row.Scan(&bar)
+	return bar, err
+}
diff --git a/internal/endtoend/testdata/mysql_optimizer_hints/mysql/query.sql b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/query.sql
new file mode 100644
index 0000000000..fa90093b66
--- /dev/null
+++ b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/query.sql
@@ -0,0 +1,9 @@
+-- name: InlineHint :one
+SELECT /*+ MAX_EXECUTION_TIME(1000) */ bar FROM foo LIMIT 1;
+
+-- name: MultilineHint :one
+SELECT
+/*+ MAX_EXECUTION_TIME(1000) */
+bar
+FROM foo
+LIMIT 1;
diff --git a/internal/endtoend/testdata/mysql_optimizer_hints/mysql/schema.sql b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/schema.sql
new file mode 100644
index 0000000000..d849628fb1
--- /dev/null
+++ b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/schema.sql
@@ -0,0 +1 @@
+CREATE TABLE foo (bar text);
diff --git a/internal/endtoend/testdata/mysql_optimizer_hints/mysql/sqlc.json b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/sqlc.json
new file mode 100644
index 0000000000..e41c39e8b3
--- /dev/null
+++ b/internal/endtoend/testdata/mysql_optimizer_hints/mysql/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "mysql",
+      "name": "querytest",
+      "schema": "schema.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/source/code.go b/internal/source/code.go
index 8b88a24136..783682a2ee 100644
--- a/internal/source/code.go
+++ b/internal/source/code.go
@@ -115,6 +115,12 @@ func StripComments(sql string) (string, []string, error) {
 			continue
 		}
 		if strings.HasPrefix(t, "/*") && strings.HasSuffix(t, "*/") {
+			// Preserve MySQL optimizer hints, which share block-comment
+			// syntax but are semantically part of the query.
+			if strings.HasPrefix(t, "/*+") {
+				lines = append(lines, t)
+				continue
+			}
 			t = strings.TrimPrefix(t, "/*")
 			t = strings.TrimSuffix(t, "*/")
 			comments = append(comments, t)