DALLAS -- Commissioner Rob Manfred says Major League Baseball expects to make a decision on possible discipline against Los Angeles Angels star Josh Hamilton by Opening Day.

Manfred said Friday that "we are working toward a result."

Hamilton has had a long history of drug and alcohol abuse, and has been suspended in the past. The Angels said Hamilton met with baseball officials last month, but neither side provided details on the reason for the session.

Hamilton is recovering from shoulder surgery and his status for opening day was in jeopardy even before the meeting with MLB.

"I expect a decision before opening day. Obviously with Josh Hamilton recovering from surgery, that may give us some more time because he won't play," Manfred said.

Hamilton is going into the third season of a five-year, $125 million contract with the Angels. The 33-year-old outfielder has totaled 31 homers and 123 RBIs in two injury-interrupted seasons.