database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch 'bb-10.3-release' into bb-10.4-release

Browse Source 
Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution"
was null-merged. 10.4 version of the fix is coming up separately
This commit is contained in:
Sergei Golubchik
2021-02-12 17:44:22 +01:00
parent ef5adf5207 691f93d6d1
commit 00a313ecf3
309 changed files with 21633 additions and 3317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_test.cc
View File

@ -565,6 +565,7 @@ void mysql_print_status()
STATUS_VAR tmp;
uint count;
tmp= global_status_var;
count= calc_sum_of_all_status(&tmp);
printf("\nStatus information:\n\n");
(void) my_getwd(current_dir, sizeof(current_dir),MYF(0));