diff options
| author | unknown <cmiller@zippy.(none)> | 2006-05-02 15:07:00 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-05-02 15:07:00 -0400 |
| commit | 567ae0ca263804313d6911f953707ebf30fa9c26 (patch) | |
| tree | d80dc9de39ffa1ce707de03c89d4124576813700 | |
| parent | d6c258848266cb2868aec8d17c9921856c9d1bb3 (diff) | |
| download | mariadb-git-567ae0ca263804313d6911f953707ebf30fa9c26.tar.gz | |
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.
| -rw-r--r-- | mysql-test/t/mysql_client_test-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysql_client_test.opt | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/mysql_client_test-master.opt b/mysql-test/t/mysql_client_test-master.opt new file mode 100644 index 00000000000..3711946168d --- /dev/null +++ b/mysql-test/t/mysql_client_test-master.opt @@ -0,0 +1 @@ +--log --log-output=FILE diff --git a/mysql-test/t/mysql_client_test.opt b/mysql-test/t/mysql_client_test.opt deleted file mode 100644 index 968ba95c6cc..00000000000 --- a/mysql-test/t/mysql_client_test.opt +++ /dev/null @@ -1 +0,0 @@ ---log |