--- mysql-test/t/mysql.test.orig	2007-09-15 22:19:49.000000000 +0300
+++ mysql-test/t/mysql.test	2007-09-15 22:19:01.000000000 +0300
@@ -282,6 +282,21 @@
 #
 --exec $MYSQL test -e "/*! \C latin1 */ select 1;"
 
+#
+# Bug#25663: Simple syntax error confounds MySQL console
+#
+# before patch: ERROR 1049 : Unknown database 'gg;'
+# after patch:  ERROR 1064 : You have an error in your SQL syntax;
+#
+--write_file $MYSQLTEST_VARDIR/tmp/bug25663.expected
+ERROR 1064 (42000) at line 1: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '\r gg' at line 1
+EOF
+--error 1
+--exec $MYSQL -e "select \r gg;" 2> $MYSQLTEST_VARDIR/tmp/bug25663.returned
+--diff_files $MYSQLTEST_VARDIR/tmp/bug25663.expected $MYSQLTEST_VARDIR/tmp/bug25663.returned
+remove_file $MYSQLTEST_VARDIR/tmp/bug25663.expected;
+remove_file $MYSQLTEST_VARDIR/tmp/bug25663.returned;
+
 --echo End of 5.0 tests
 
 #