summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-10-25 16:41:43 +0200
committerSergei Golubchik <serg@mariadb.org>2016-10-25 16:41:43 +0200
commit12c3e16dfa872f19186761da28590c2703c96a6b (patch)
treee026ac1661b03e2048ca3eca043fd61dea37eee2 /mysql-test/r/mysqltest.result
parent39dceaae607e2c9f53146d5b23f8dee330643cb2 (diff)
parent6e257274d98843b228e5bd08da74031f6f3a202d (diff)
downloadmariadb-git-12c3e16dfa872f19186761da28590c2703c96a6b.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result6
1 files changed, 0 insertions, 6 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index e258b1d156f..fa054d457f9 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -269,12 +269,6 @@ source database
echo message echo message
mysqltest: At line 1: Missing argument in exec
-1
-1
-2
-2
-X
-3
MySQL
"MySQL"
MySQL: The