← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/server_detect.h

  • Committer: Mark Atwood
  • Date: 2011-05-12 06:41:59 UTC
  • mfrom: (2308.1.1 bug781472)
  • Revision ID: me@mark.atwood.name-20110512064159-bn2f9inbrawmefxh
merge lp:~stewart/drizzle/bug781472

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/server_detect.h
41
41
    {
42
42
      boost::match_flag_type flags = boost::match_default;
43
43
 
44
 
      boost::regex mysql_regex("(5\\.[0-9]+\\.[0-9]+)");
45
 
      boost::regex drizzle_regex("(20[0-9]{2}\\.(0[1-9]|1[012])\\.[0-9]+)");
 
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
46
 
47
47
      version= drizzle_con_server_version(connection);
48
48
 
49
 
      if (regex_search(version, mysql_regex, flags))
50
 
      {
51
 
        type= SERVER_MYSQL_FOUND;
52
 
      }
53
 
      else if (regex_search(version, drizzle_regex, flags))
 
49
      if (regex_search(version, drizzle_regex, flags))
54
50
      {
55
51
        type= SERVER_DRIZZLE_FOUND;
56
52
      }
 
53
      else if (regex_search(version, mysql_regex, flags))
 
54
      {
 
55
        type= SERVER_MYSQL_FOUND;
 
56
      }
57
57
      else
58
58
      {
59
 
        std::cerr << "Server version not detectable" << std::endl;
60
 
        abort();
 
59
        std::cerr << "Server version not detectable. Assuming MySQL." << std::endl;
 
60
        type= SERVER_MYSQL_FOUND;
61
61
      }
62
62
    }
63
63