summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysql.test
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2011-11-12 19:56:29 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2011-11-12 19:56:29 +0400
commit7c7269d3723a4044816b1f80424af0ff2bc56f3f (patch)
tree877f14dd7dcbe276aa07dc26cbe63541bc893aff /mysql-test/t/mysql.test
parent45bb808c7ec0a77bb51038ff370753f8ed5c7ddf (diff)
parentdb0aed93482759844af7b39c9bf6e7fe141f28f6 (diff)
downloadmariadb-git-7c7269d3723a4044816b1f80424af0ff2bc56f3f.tar.gz
merging.
Diffstat (limited to 'mysql-test/t/mysql.test')
-rw-r--r--mysql-test/t/mysql.test9
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index d1ae90be864..d1dd648d5c7 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -6,7 +6,7 @@
#
--disable_warnings
-drop table if exists t1;
+drop table if exists t1,t2,t3;
--enable_warnings
#
@@ -124,6 +124,13 @@ drop table t1;
--exec echo "use" > $file
--exec $MYSQL < $file 2>&1
+# Test exceutable comments
+--exec echo "SELECT 1 /*! +1 */;" > $file
+--exec echo "SELECT 1 /*M! +1 */;" >> $file
+--exec echo "SELECT 1 /*!00000 +1 */;" >> $file
+--exec echo "SELECT 1 /*M!00000 +1 */" >> $file
+--exec $MYSQL < $file 2>&1
+
--remove_file $file
#