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

Merge branch '11.2' into 11.3

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-21 01:17:10 +01:00
parent 9e76d94ef0 fef31a26f3
commit 7f0094aac8
760 changed files with 29692 additions and 5649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_plugin.cc
View File

@ -1688,7 +1688,6 @@ int plugin_init(int *argc, char **argv, int flags)
}
}
free_root(&tmp_root, MYF(MY_MARK_BLOCKS_FREE));
tmp.state= PLUGIN_IS_UNINITIALIZED;
if (register_builtin(plugin, &tmp, &plugin_ptr))
goto err_unlock;
@ -1969,7 +1968,7 @@ static void plugin_load(MEM_ROOT *tmp_root)
the mutex here to satisfy the assert
*/
mysql_mutex_lock(&LOCK_plugin);
plugin_add(tmp_root, false, &name, &dl, MYF(ME_ERROR_LOG));
plugin_add(tmp_root, true, &name, &dl, MYF(ME_ERROR_LOG));
free_root(tmp_root, MYF(MY_MARK_BLOCKS_FREE));
mysql_mutex_unlock(&LOCK_plugin);
}