← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump_data.cc

Merge in Monty/Andrew's boolean MySQL compatible patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump_data.cc
373
373
          {
374
374
            os << "NULL";
375
375
          }
 
376
          else if (obj.table->fields[i]->type.compare("BOOLEAN") == 0)
 
377
          {
 
378
            if (strncmp(row[i], "1", 1) == 0)
 
379
              os << "TRUE";
 
380
            else
 
381
              os << "FALSE";
 
382
          }
376
383
          else
377
384
            os << "'" << DrizzleDumpData::escape(row[i], row_sizes[i]) << "'";
378
385
          byte_counter+= 3;
561
568
    throw std::exception();
562
569
  }
563
570
 
564
 
  boost::match_flag_type flags = boost::match_default; 
565
 
 
566
 
  boost::regex mysql_regex("(5\\.[0-9]+\\.[0-9]+)");
567
 
  boost::regex drizzle_regex("(20[0-9]{2}\\.(0[1-9]|1[012])\\.[0-9]+)");
568
 
 
569
 
  std::string version(getServerVersion());
570
 
 
571
 
  if (regex_search(version, mysql_regex, flags))
572
 
    serverType= SERVER_MYSQL_FOUND;
573
 
  else if (regex_search(version, drizzle_regex, flags))
574
 
    serverType= SERVER_DRIZZLE_FOUND;
575
 
  else
576
 
    serverType= SERVER_UNKNOWN_FOUND;
 
571
  ServerDetect server_detect= ServerDetect(&connection);
 
572
 
 
573
  serverType= server_detect.getServerType();
 
574
  serverVersion= server_detect.getServerVersion();
577
575
}
578
576
 
579
577
drizzle_result_st* DrizzleDumpConnection::query(std::string &str_query)