From 282c303746d0653a927b0fcd16ecdc9b690bbb00 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Mon, 29 Aug 2011 18:14:14 +0300
Subject: Added MariaDB executable comment syntax:  /*M!##### */

client/mysql.cc:
  Don't remove MariaDB executable comments.
mysql-test/r/comments.result:
  Test MariaDB executable comments.
mysql-test/r/mysql.result:
  Test MariaDB executable comments.
mysql-test/t/comments.test:
  Test MariaDB executable comments.
mysql-test/t/mysql.test:
  Test MariaDB executable comments.
sql/sql_cache.cc:
  Don't delete MariaDB executable comments.
sql/sql_lex.cc:
  Handle MariaDB executable comments
---
 mysql-test/t/mysql.test | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'mysql-test/t/mysql.test')

diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index d1ae90be864..4efd7c7636d 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -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
 
 #
-- 
cgit v1.2.1