Add small fixes after the TS porting branch update

Author: Alexander Zhdanov

builds/install/misc/replication.conf

@@ -14,12 +14,12 @@ database
 	# Pattern (regular expression) that defines what tables must be included into
 	# replication. By default, all tables are replicated.
 	#
-	# include_filter =
+	# include_filter = 
 
 	# Pattern (regular expression) that defines what tables must be excluded from
 	# replication. By default, all tables are replicated.
 	#
-	# exclude_filter =
+	# exclude_filter = 
 
 	# Boolean parameters describing how replication errors must be handled.
 	#
@@ -42,20 +42,20 @@ database
 
 	# Directory to store replication journal files.
 	#
-	# journal_directory =
+	# journal_directory = 
 
 	# Prefix for replication journal file names. It will be automatically suffixed
 	# with an ordinal sequential number. If not specified, database filename
 	# (without path) is used as a prefix.
 	#
-	# journal_file_prefix =
+	# journal_file_prefix = 
 
 	# Maximum allowed size for a single replication segment.
 	#
 	# journal_segment_size = 16777216 # 16MB
 
 	# Maximum allowed number of full replication segments. Once this limit is reached,
-	# the replication process is temporarily delayed to allow the archiving to catch up.
+	# the replication process is temporarily delayed to allow the archiving to catch up. 
  	# If any of the full segments is not archived during one minute,
  	# the replication fails with an error.
  	#
@@ -76,7 +76,7 @@ database
 	# Directory to store archived replication segments.
 	# It also defines the $(archpathname) substitution macro (see below).
 	#
-	# journal_archive_directory =
+	# journal_archive_directory = 
 
 	# Program (complete command line with arguments) that is executed when some
 	# replication segment gets full and needs archiving.
@@ -97,7 +97,7 @@ database
 	# or
 	# Windows: "copy $(pathname) $(archivepathname)"
 	#
-	# journal_archive_command =
+	# journal_archive_command = 
 
 	# Timeout, in seconds, to wait until incomplete segment is scheduled for archiving.
 	# It allows to minimize the replication gap if the database is modified rarely.
@@ -121,7 +121,7 @@ database
 	#
 	# Multiple entries are allowed (for different synchronous replicas).
 	#
-	# sync_replica =
+	# sync_replica = 
 
 
 	### REPLICA SIDE SETTINGS
@@ -135,13 +135,13 @@ database
 
 	# Directory to search for the journal files to be replicated.
 	#
-	# journal_source_directory =
+	# journal_source_directory = 
 
 	# Filter to limit replication to the particular source database (based on its GUID).
 	# Expected format: "{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}"
 	# Note that double quotes are mandatory, as well as curly braces.
 	#
-	# source_guid =
+	# source_guid = 
 
 	# If enabled, replication.log contains the detailed log of operations performed
 	# by the replication server. Otherwise (by default), only errors and warnings are logged.

src/dsql/parse-conflicts.txt

@@ -1 +1 @@
-101 shift/reduce conflicts, 56 reduce/reduce conflicts.
+121 shift/reduce conflicts, 23 reduce/reduce conflicts.

src/dsql/parse.y

@@ -1557,21 +1557,22 @@ create_clause
 			node->createIfNotExistsOnly = $2;
 			$$ = node;
 		}
-	| unique_opt order_direction INDEX if_not_exists_opt symbol_index_name ON simple_table_name
+	| unique_opt order_direction INDEX if_not_exists_opt symbol_index_name index_active_opt ON simple_table_name
 			{
 				const auto node = newNode<CreateIndexNode>(*$5);
+				node->active = $6;
 				node->unique = $1;
 				node->descending = $2;
 				node->createIfNotExistsOnly = $4;
-				node->relation = $7;
+				node->relation = $8;
 				$$ = node;
 			}
-		index_definition(static_cast<CreateIndexNode*>($8)) tablespace_name_clause_opt
+		index_definition(static_cast<CreateIndexNode*>($9)) tablespace_name_clause_opt
 			{
-				if ($10)
-					static_cast<CreateIndexNode*>($8)->tableSpace = *$10;
+				if ($11)
+					static_cast<CreateIndexNode*>($9)->tableSpace = *$11;
 
-				$$ = $8;
+				$$ = $9;
 			}
 	| FUNCTION if_not_exists_opt function_clause
 		{
@@ -1777,6 +1778,12 @@ alter_exception_clause
 
 // CREATE INDEX
 
+%type <boolVal> index_active_opt
+index_active_opt
+	: /* nothing */		{ $$ = true; }
+	| index_active		{ $$ = $1; }
+	;
+
 %type <boolVal> unique_opt
 unique_opt
 	: /* nothing */		{ $$ = false; }
@@ -4748,6 +4755,12 @@ alter_index_clause
 		}
 	;
 
+%type <boolVal> index_active
+index_active
+	: ACTIVE	{ $$ = true; }
+	| INACTIVE	{ $$ = false; }
+	;
+
 %type <ddlNode>	alter_udf_clause
 alter_udf_clause
 	: symbol_UDF_name entry_op module_op