← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/server_detect.h

  • Committer: Brian Aker
  • Date: 2011-07-26 16:13:43 UTC
  • mto: This revision was merged to the branch mainline in revision 2373.
  • Revision ID: brian@tangent.org-20110726161343-t71d1etj03s8rywp
Additional update for OSX.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/server_detect.h
35
35
    server_type getServerType() { return type; }
36
36
    std::string& getServerVersion() { return version; }
37
37
 
38
 
    ServerDetect(drizzle_con_st *connection) :
39
 
      type(SERVER_UNKNOWN_FOUND),
40
 
      version("")
41
 
    {
42
 
      boost::match_flag_type flags = boost::match_default;
43
 
 
44
 
      boost::regex mysql_regex("^([3-9]\\.[0-9]+\\.[0-9]+)");
45
 
      boost::regex drizzle_regex("^(20[0-9]{2}\\.(0[1-9]|1[012])\\.[0-9]+)");
46
 
 
47
 
      version= drizzle_con_server_version(connection);
48
 
 
49
 
      if (regex_search(version, drizzle_regex, flags))
50
 
      {
51
 
        type= SERVER_DRIZZLE_FOUND;
52
 
      }
53
 
      else if (regex_search(version, mysql_regex, flags))
54
 
      {
55
 
        type= SERVER_MYSQL_FOUND;
56
 
      }
57
 
      else
58
 
      {
59
 
        std::cerr << "Server version not detectable. Assuming MySQL." << std::endl;
60
 
        type= SERVER_MYSQL_FOUND;
61
 
      }
62
 
    }
 
38
    ServerDetect(drizzle_con_st *connection);
63
39
 
64
40
  private:
65
41
    server_type type;