mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Portability fixes.
Improve mysql-test to be more robust. Fix that GRANT doesn't delete SSL options Change innobase_flush_log_at_trx_commit to uint. Don't rotate logs if we read a rotate log entry from the master.
This commit is contained in:
@ -285,12 +285,14 @@ udf_func *find_udf(const char *name,uint length,bool mark_used)
|
||||
|
||||
/* TODO: This should be changed to reader locks someday! */
|
||||
pthread_mutex_lock(&THR_LOCK_udf);
|
||||
udf=(udf_func*) hash_search(&udf_hash,(byte*) name,
|
||||
length ? length : (uint) strlen(name));
|
||||
if (!udf->dlhandle)
|
||||
udf=0; // Could not be opened
|
||||
else if (mark_used)
|
||||
udf->usage_count++;
|
||||
if ((udf=(udf_func*) hash_search(&udf_hash,(byte*) name,
|
||||
length ? length : (uint) strlen(name))))
|
||||
{
|
||||
if (!udf->dlhandle)
|
||||
udf=0; // Could not be opened
|
||||
else if (mark_used)
|
||||
udf->usage_count++;
|
||||
}
|
||||
pthread_mutex_unlock(&THR_LOCK_udf);
|
||||
DBUG_RETURN(udf);
|
||||
}
|
||||
|
Reference in New Issue
Block a user