Misc

src/dsql/ddl.cpp

@@ -323,8 +323,6 @@ void DDL_execute(dsql_req* request)
 		METD_drop_relation(request, string);
 	}
 
-	// for delete & modify, get rid of the cached procedure metadata
-
 	if ((type == nod_mod_procedure) ||
 	    (type == nod_del_procedure) ||
 	    (type == nod_replace_procedure) ||

src/dsql/dsql.cpp

@@ -2798,6 +2798,10 @@ void DSQL_pretty(const dsql_nod* node, int column)
 		verb = "collation_from";
 		break;
 
+	case nod_collation_from_external:
+		verb = "collation_from_external";
+		break;
+
 	case nod_collation_attr:
 		verb = "collation_attr";
 		break;

src/dsql/parse.y

@@ -493,7 +493,6 @@ static LexerState lex;
 %token NEXT
 %token SEQUENCE
 %token RESTART
-%token ACCENT
 %token BOTH
 %token COLLATION
 %token COMMENT
@@ -514,15 +513,16 @@ static LexerState lex;
 
 /* tokens added for Firebird 2.1 */
 
+%token ACCENT
 %token GLOBAL 
 %token INSENSITIVE
 %token LIST
 %token PAD
 %token PRESERVE
+%token RECURSIVE 
 %token SENSITIVE
 %token SPACE
 %token TEMPORARY 
-%token RECURSIVE 
 
 /* precedence declarations for expression evaluation */
 

src/isql/show.epp

@@ -1741,7 +1741,7 @@ static processing_state show_collations(const SCHAR* object)
 		fb_utils::exact_name(CL.RDB$COLLATION_NAME);
 
 		if ((!*object && (CL.RDB$SYSTEM_FLAG.NULL || CL.RDB$SYSTEM_FLAG == 0)) ||
-			!strcmp(CL.RDB$COLLATION_NAME, object))
+			strcmp(CL.RDB$COLLATION_NAME, object) == 0)
 		{
 			found = true;
 

src/jrd/intl.h

@@ -158,4 +158,4 @@ inline USHORT INTL_TEXT_TYPE(const dsc& desc)
 #define TTYPE_TO_CHARSET(tt)    ((USHORT)((tt) & 0x00FF))
 #define TTYPE_TO_COLLATION(tt)  ((USHORT)((tt) >> 8))
 
-#endif /* JRD_INTL_H */
+#endif	// JRD_INTL_H

src/jrd/intl_classes.h

@@ -639,4 +639,4 @@ public:
 
 } //namespace Jrd
 
-#endif /* JRD_INTL_CLASSES_H */
+#endif	// JRD_INTL_CLASSES_H

src/jrd/tra.cpp

@@ -815,8 +815,8 @@ void TRA_post_resources(thread_db* tdbb, jrd_tra* transaction, ResourceList& res
  **************************************
  *
  * Functional description
- *	Post interest in relation/procedure existence to transaction.
- *	This guarantees that the relation/procedure won't be dropped
+ *	Post interest in relation/procedure/collation existence to transaction.
+ *	This guarantees that the relation/procedure/collation won't be dropped
  *	out from under the transaction.
  *
  **************************************/