diff options
| author | msvensson@shellback.(none) <> | 2006-04-27 22:21:23 +0200 |
|---|---|---|
| committer | msvensson@shellback.(none) <> | 2006-04-27 22:21:23 +0200 |
| commit | f52247a6e8000b743ef61b5cea1e3d3f7a723241 (patch) | |
| tree | 794e1f73f494cd185564e1d7777e98dd03da521b /extra/yassl/src/yassl_int.cpp | |
| parent | e5004d13126c617be159bc29b7bb7fd41c466659 (diff) | |
| download | mariadb-git-f52247a6e8000b743ef61b5cea1e3d3f7a723241.tar.gz | |
Fix merge error
Diffstat (limited to 'extra/yassl/src/yassl_int.cpp')
| -rw-r--r-- | extra/yassl/src/yassl_int.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp index d998dbf905e..396461a6ed5 100644 --- a/extra/yassl/src/yassl_int.cpp +++ b/extra/yassl/src/yassl_int.cpp @@ -1375,7 +1375,7 @@ Sessions& GetSessions() static sslFactory* sslFactoryInstance = 0; -sslFactory& GetSSL_Factory() +sslFactory& GetSSL_Factory(){ if (!sslFactoryInstance) sslFactoryInstance = NEW_YS sslFactory; return *sslFactoryInstance; |