cherry-pick bugfix from 3.1 to open source branch

src/sql/parser/sql_parser_mysql_mode.y

@@ -12334,6 +12334,10 @@ NAME_OB
 {
   make_name_node($$, result->malloc_pool_, "database");
 }
+| SCHEMA
+{
+  make_name_node($$, result->malloc_pool_, "database");
+}
 | COALESCE
 {
   make_name_node($$, result->malloc_pool_, "coalesce");

src/sql/parser/sql_parser_mysql_mode_lex.c

@@ -72495,7 +72495,7 @@ static int input (yyscan_t yyscanner );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -72506,7 +72506,7 @@ static int input (yyscan_t yyscanner );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		unsigned n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \