Commit 567ae0ca authored by unknown's avatar unknown
Browse files

More merging assistence. 

Logging behavior changed in early 5.1.  (The filename was never right, but
the "opt" file is unnecessary in 5.0 anyway.)


mysql-test/t/mysql_client_test-master.opt:
  Logging behavior changed in early 5.1.
parent d6c25884

mysql-test/t/mysql_client_test-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--log --log-output=FILE

mysql-test/t/mysql_client_test.opt

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
--log