summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-05-09 17:06:21 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-05-09 17:06:27 +0300
commit85ccdd9ff0a7cae9554ed6da67b42480b5264e1d (patch)
tree87accbf4a24129ada77b8771ec7981469fa27510 /mysql-test
parentd94a9553db0afee3a29f3fff0511e9a1cb5b83d2 (diff)
downloadmariadb-git-85ccdd9ff0a7cae9554ed6da67b42480b5264e1d.tar.gz
Rename a test (fix merge error)
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/main/ps_qc_innodb.result (renamed from mysql-test/r/ps_qc_innodb.result)0
-rw-r--r--mysql-test/main/ps_qc_innodb.test (renamed from mysql-test/t/ps_qc_innodb.test)0
2 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/r/ps_qc_innodb.result b/mysql-test/main/ps_qc_innodb.result
index 29c364348dc..29c364348dc 100644
--- a/mysql-test/r/ps_qc_innodb.result
+++ b/mysql-test/main/ps_qc_innodb.result
diff --git a/mysql-test/t/ps_qc_innodb.test b/mysql-test/main/ps_qc_innodb.test
index e09a2bf4070..e09a2bf4070 100644
--- a/mysql-test/t/ps_qc_innodb.test
+++ b/mysql-test/main/ps_qc_innodb.test