mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.0
This commit is contained in:
commit
f45b26a75e
2 changed files with 1 additions and 9 deletions
|
@ -1375,7 +1375,7 @@ Sessions& GetSessions()
|
|||
|
||||
static sslFactory* sslFactoryInstance = 0;
|
||||
|
||||
sslFactory& GetSSL_Factory()
|
||||
sslFactory& GetSSL_Factory(){
|
||||
if (!sslFactoryInstance)
|
||||
sslFactoryInstance = NEW_YS sslFactory;
|
||||
return *sslFactoryInstance;
|
||||
|
|
|
@ -2738,14 +2738,6 @@ void CleanUp()
|
|||
}
|
||||
|
||||
|
||||
// Clean up static singleton holders, not a leak, but helpful to have gone
|
||||
// when checking for leaks
|
||||
void CleanUp()
|
||||
{
|
||||
tcDelete(one);
|
||||
tcDelete(zero);
|
||||
}
|
||||
|
||||
Integer::Integer(RandomNumberGenerator& rng, const Integer& min,
|
||||
const Integer& max)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue