[Commits] e25dc4acce5: Fix main.parser post 10.1->10.2 merge

vicentiu at mariadb.org vicentiu at mariadb.org
Mon Apr 9 17:22:21 EEST 2018


revision-id: e25dc4acce5b51436ee5339e75e7481d1e9b2fbf (mariadb-10.2.14-31-ge25dc4acce5)
parent(s): d4d03fd3d8861ce682fc1a31e0d0bf304abdc7c6
author: Vicențiu Ciorbaru
committer: Vicențiu Ciorbaru
timestamp: 2018-04-09 17:21:02 +0300
message:

Fix main.parser post 10.1->10.2 merge

The parser test was failing as the format for ER_UNKNOWN_SYSTEM_VARIABLE
error changed to first require the string length, then the actual
string. This was not visible in any previous versions.

---
 sql/sql_yacc.yy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 86867cae033..b2088b0e640 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -15176,7 +15176,7 @@ option_value_no_option_type:
             struct sys_var_with_base tmp= $4;
             if (tmp.var == trg_new_row_fake_var)
             {
-              my_error(ER_UNKNOWN_SYSTEM_VARIABLE, MYF(0), "NEW");
+              my_error(ER_UNKNOWN_SYSTEM_VARIABLE, MYF(0), 3, "NEW");
               MYSQL_YYABORT;
             }
             /* Lookup if necessary: must be a system variable. */


More information about the commits mailing list