database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2024-12-19 15:38:53 +02:00
parent c391fb1ff1 c982a143fc
commit a54d151fc1
129 changed files with 1398 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/mysqlimport.c
View File

@@ -657,7 +657,6 @@ error:
pthread_cond_signal(&count_threshhold);
pthread_mutex_unlock(&counter_mutex);
mysql_thread_end();
pthread_exit(0);
return 0;
}

1
client/mysqltest.cc
View File

@@ -990,7 +990,6 @@ end_thread:
cn->mysql= 0;
cn->query_done= 1;
mysql_thread_end();
pthread_exit(0);
DBUG_RETURN(0);
}