consistency in error message naming

include/mysql.h

@@ -146,6 +146,7 @@ typedef unsigned long long my_ulonglong;
 #define ER_SPATIAL_CANT_HAVE_NULL ER_INDEX_CANNOT_HAVE_NULL
 #define ER_INNODB_NO_FT_TEMP_TABLE ER_NO_INDEX_ON_TEMPORARY
 #define ER_CANT_CHANGE_TX_CHARACTERISTICS ER_CANT_SET_IN_TRANSACTION
+#define ER_VARIABLE_NOT_SETTABLE_IN_SF_OR_TRIGGER ER_VARIABLE_NOT_SETTABLE_IN_SF_OR_TRG
 
 typedef struct st_mysql_rows {
   struct st_mysql_rows *next;		/* list of rows */

sql/share/errmsg-utf8.txt

@@ -9406,7 +9406,7 @@ ER_TABLE_HAS_NO_FT
         spa "La tabla no tiene índice FULLTEXT que soporte esta consulta (query)"
         sw "Jedwali halina faharasa ya FULLTEXT kuruhusisha utekelezaji wa hoja hii"
 
-ER_VARIABLE_NOT_SETTABLE_IN_SF_OR_TRIGGER
+ER_VARIABLE_NOT_SETTABLE_IN_SF_OR_TRG
         chi "无法在存储的函数或触发器中设置系统变量%.200s"
         eng "The system variable %.200s cannot be set in stored functions or triggers"
         geo "სისტემური ცვლადის %.200s მნიშვნელობას დამახსოვრებული ფუნქციებიდან და ტრიგერებიდან ვერ დააყენებთ"

sql/sys_vars.inl

@@ -3141,7 +3141,7 @@ private:
         Because we invalidate the sp caches, we can't set the session path
         in a stored function.
       */
-      my_error(ER_VARIABLE_NOT_SETTABLE_IN_SF_OR_TRIGGER, MYF(0), name.str);
+      my_error(ER_VARIABLE_NOT_SETTABLE_IN_SF_OR_TRG, MYF(0), name.str);
       if (var->save_result.ptr)
         ((Sql_path*) var->save_result.ptr)->free();