From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 24 Dec 2011 14:12:14 +0000 (+0200)
Subject: Merge branch 'master' into full-month-stats
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/8e8c6cdddc6af0a1e7ebcd7fa947395b66bf1103?hp=-c

Merge branch 'master' into full-month-stats
---

8e8c6cdddc6af0a1e7ebcd7fa947395b66bf1103
diff --combined projects/stargazer/plugins/store/postgresql/postgresql_store.h
index 7b3d7660,edba0359..ebbbb3b8
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.h
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.h
@@@ -37,9 -37,9 +37,9 @@@
  
  #include "stg/store.h"
  
 -// Minimal DB version is 5
 -// Recommended DB version is 6 (support FreeMb logging on disconnects)
 -#define DB_MIN_VERSION 5
 +// Minimal DB version is 7
 +// Recommended DB version is 7 (support full month stats)
 +#define DB_MIN_VERSION 7
  
  extern "C" STORE * GetStore();
  
@@@ -121,6 -121,9 +121,9 @@@ public
      inline const string & GetStrError() const { return strError; };
      inline const string & GetVersion() const { return versionString; };
  private:
+     POSTGRESQL_STORE(const POSTGRESQL_STORE & rvalue);
+     POSTGRESQL_STORE & operator=(const POSTGRESQL_STORE & rvalue);
+ 
      int StartTransaction() const;
      int CommitTransaction() const;
      int RollbackTransaction() const;