FirebirdSQL · sim1984 · Nov 20, 2025 · Nov 21, 2025 · Nov 24, 2025 · Nov 24, 2025
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![Build Status (GitHub)](https://github.com/FirebirdSQL/firebird/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/FirebirdSQL/firebird/actions/workflows/main.yml?query=branch%3Amaster)
 [![Build Status (AppVeyor)](https://ci.appveyor.com/api/projects/status/github/FirebirdSQL/firebird?branch=master&svg=true)](https://ci.appveyor.com/project/FirebirdSQL/firebird)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/FirebirdSQL/firebird)
 
 # Firebird README
 

diff --git a/builds/install/arch-specific/android/BuildFinalPackage.sh b/builds/install/arch-specific/android/BuildFinalPackage.sh
@@ -45,6 +45,23 @@ $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName push gen/$InitialDebugTar
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir && tar xvf $InitialDebugTar)"
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./common_test --log_level=error && ./libEngine14_test --log_level=error && ./isql_test --log_level=error)"
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./AfterUntar.sh)"
+
+# Verify ICU works
+$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell <<EOF
+set -e
+cd $AndroidDir/firebird
+mkdir -p icu_test
+export FIREBIRD_LOCK=$AndroidDir/firebird/icu_test
+export FIREBIRD_TMP=$AndroidDir/firebird/icu_test
+cat <<'SQL' | ./isql -q
+create database 'icu_test/icu_test.fdb';
+select '1' from rdb\$database;
+select _win1252 '2' from rdb\$database;
+select _utf8 '3' collate unicode from rdb\$database;
+drop database;
+SQL
+EOF
+
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/firebird.msg gen/Release/firebird/
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/security6.fdb gen/Release/firebird/
 #$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/examples/empbuild/employe2.fdb gen/Release/firebird/examples/empbuild/

diff --git a/builds/win32/gen_helper.nmake b/builds/win32/gen_helper.nmake
@@ -19,18 +19,21 @@ RPL_AWK_SRC=$(MISC)\def_awk.c
 RPL_GREP=$(FB_GEN_DIR)\isc_grep.exe
 RPL_GREP_SRC=$(MISC)\isc_grep.c
 # These utils are platform and build independent, use fixed temporary dir.
+UTL_TMP_DIR=$(FB_TEMP_DIR)\Release\misc
 
 updateCloopInterfaces: $(API_H_FILE) $(API_PAS_FILE)
 
+$(UTL_TMP_DIR):
+	-mkdir $@ 2>nul
 
 $(API_H_FILE): $(IDL_FILE)
 	$(CLOOP) $(IDL_FILE) c++ $@ IDL_FB_INTERFACES_H Firebird I
 
-$(RPL_AWK):	$(RPL_AWK_SRC)
+$(RPL_AWK):	$(RPL_AWK_SRC) $(UTL_TMP_DIR)
 # NMAKE strips trailing backslash during macro substitution that's why it is here and not in definition.
 	$(CPP) /Fe$@ /Fo$(UTL_TMP_DIR)\ $(RPL_AWK_SRC)
 
-$(RPL_GREP): $(RPL_GREP_SRC)
+$(RPL_GREP): $(RPL_GREP_SRC) $(UTL_TMP_DIR)
 	$(CPP) /Fe$@ /Fo$(UTL_TMP_DIR)\ $(RPL_GREP_SRC)
 
 $(FB_GEN_DIR)\iberror.pas: $(ERR_CONSTS_PAS) $(FB_ROOT_PATH)\src\include\firebird\impl\msg\*.h

diff --git a/doc/README.trace_services b/doc/README.trace_services
@@ -1,4 +1,4 @@
-		
+
 		Trace and audit services.
 
 	Firebird 2.5 offers new trace and audit facilities. These new abilities allow
@@ -12,7 +12,7 @@ engine. List of events to trace, which data items to trace and placement of
 trace output is specified by trace configuration when trace session is created.
 
 	There are two kinds of trace sessions : system audit and user trace.
-	
+
 	System audit session is started by the engine itself and obtains configuration
 from the text file. The name of this file is set via new setting in firebird.conf
 ("AuditTraceConfigFile") and by default has empty value, i.e. no system audit
@@ -44,7 +44,7 @@ session. When application reads part of the output so output size stay less than
 
 	When application decides to stop its trace session it just does detach from
 service. Also there is ability to manage trace sessions (suspend\resume\stop).
-Administrators are allowed to manage any trace session while ordinary users are 
+Administrators are allowed to manage any trace session while ordinary users are
 allowed to manage their own trace sessions only.
 
     If user trace session was created by ordinary user it will trace only
@@ -65,9 +65,9 @@ plugin is responsible for logging these events in some form.
 
 	There is "standard" implementation of trace plugin, fbtrace.dll (.so) located
 in \plugins folder.
-
 
-	There is new specialized standalone utility to work with trace services : 
+
+	There is new specialized standalone utility to work with trace services :
 fbtracemgr. It has the following command line switches :
 
 Action switches :
@@ -94,20 +94,20 @@ Also, it prints usage screen if run without parameters.
 
 
 	Examples
-	
+
 I. Sample configuration files for user trace sessions:
-	
+
 a) Trace prepare, free and execution of all statements within connection 12345
 
 database
 {
-	enabled			true
-	connection_id		12345
-	log_statement_prepare	true
-	log_statement_free	true
-	log_statement_start	true
-	log_statement_finish	true
-	time_threshold		0
+	enabled = true
+	connection_id = 12345
+	log_statement_prepare= true
+	log_statement_free = true
+	log_statement_start = true
+	log_statement_finish = true
+	time_threshold = 0
 }
 
 b) Trace all connections of given user to database mydatabase.fdb
@@ -116,28 +116,28 @@ b) Trace all connections of given user to database mydatabase.fdb
 
 database = %[\\/]mydatabase.fdb
 {
-	enabled			true
-	include_filter		(%)(INSERT|UPDATE|DELETE)(%)
-	log_statement_finish	true
-	log_procedure_finish	true
-	log_trigger_finish	true
-	print_plan		true
-	print_perf		true
-	time_threshold		0
+	enabled = true
+	include_filter = (%)(INSERT|UPDATE|DELETE)(%)
+	log_statement_finish = true
+	log_procedure_finish = true
+	log_trigger_finish = true
+	print_plan = true
+	print_perf = true
+	time_threshold = 0
 }
-	
+
 c) Trace connections and transactions in all databases except of security database
 
 database
 {
-	enabled			true
-	log_connections		true
-	log_transactions	true
+	enabled = true
+	log_connections = true
+	log_transactions = true
 }
 
 database = security.db
 {
-	enabled			false
+	enabled = false
 }
 
 
@@ -148,27 +148,27 @@ a) Start user trace named "My trace" using configuration file fbtrace.conf and r
    its output on the screen :
 
 	fbtracemgr -se service_mgr -start -name "My trace" -config fbtrace.conf
-	
+
 	To stop this trace session press Ctrl+C at fbtracemgr console window. Or, in
-another console : list sessions and look for interesting session ID (b) and stop it 
+another console : list sessions and look for interesting session ID (b) and stop it
 using this found ID (e).
 
 b) List trace sessions
 
 	fbtracemgr -se service_mgr -list
-	
+
 c) Suspend trace session with ID 1
 
 	fbtracemgr -se service_mgr -suspend -id 1
-	
+
 d) Resume trace session with ID 1
 
 	fbtracemgr -se service_mgr -resume -id 1
-	
+
 e) Stop trace session with ID 1
 
 	fbtracemgr -se service_mgr -stop -id 1
-	
+
 
 
     There are three general use cases :

diff --git a/doc/Using_OO_API.md b/doc/Using_OO_API.md
@@ -2101,3 +2101,44 @@ struct FbVarChar
 
 This document is currently missing 2 types of plugins – ExternalEngine and Trace. Information about them will be made
 available in next release of it.
+
+# Trace plugin
+
+_TODO_
+
+# Trace objects
+
+_TODO_
+
+# Trace performance statistics
+
+Trace plugin may retrieve various performance statistics available using the `getPerfStats()` method of the trace object, which returns a pointer to the `IPerformanceStats` interface.
+
+```cpp
+IPerformanceStats* stats = statement->getPerfStats();
+```
+
+The returned pointer may be `nullptr` if the corresponding trace object is not in the terminate state yet (i.e. still active / being executed).
+
+<a name="PerformanceStats"></a> PerformanceStats interface:
+
+- ISC_UINT64 getElapsedTime() - returns the elapsed time, in milliseconds
+- ISC_UINT64 getFetchedRecords() - returns number of records fetched during execution
+- IPerformanceCounters* getCounters(unsigned group) - returns the requested performance counters group
+
+The following groups of performance counters are currently supported:
+
+- COUNTER_GROUP_PAGES - per-pagespace counters
+- COUNTER_GROUP_TABLES - per-table counters
+
+If `getCounters()` is called with a counter group not supported by the implementation, `nullptr` is returned.
+
+<a name="PerformanceCounters"></a> PerformanceCounters interface:
+
+- unsigned getObjectCount() - returns number of objects (e.g. tables) containing non-zero performance counters
+- unsigned getMaxCounterIndex() - returns maximum index number of the performance counters supported by the implementation (it's the same for all objects of the same group)
+- unsigned getObjectId(unsigned index) - returns ID of the specified object
+- const char* getObjectName(unsigned index) - returns name of the specified object
+- const ISC_INT64* getObjectCounters(unsigned index) - returns pointer to the vector of performance counters (containing getMaxCounterIndex() + 1 elements) of the specified object
+
+The returned pointer to the vector (as well as the whole instance of `PerformanceStats`) is valid until the object used to obtain the statistics (using the `getPerfStats()` method) is destroyed.
diff --git a/doc/sql.extensions/README.listagg b/doc/sql.extensions/README.listagg
@@ -50,7 +50,7 @@ INSERT INTO TEST_T values(3, 'C', 'A', 'L', true,  'Ж');
 INSERT INTO TEST_T values(4, 'D', 'B', 'K', true,  'Й');
 COMMIT;
 
-SELECT LISTAGG (ALL COL4, ':') AS FROM TEST_T;
+SELECT LISTAGG (ALL COL4, ':') FROM TEST_T;
 =======
 J:I:L:K
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,7 @@ INSERT INTO TEST_T values(3, 'C', 'A', 'L', true, 'Ж'); @@
     INSERT INTO TEST_T values(4, 'D', 'B', 'K', true,  'Й');
     COMMIT;
-    SELECT LISTAGG (ALL COL4, ':') AS FROM TEST_T;
+    SELECT LISTAGG (ALL COL4, ':') FROM TEST_T;
     =======
     J:I:L:K
@@ Expand Down @@