← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump_data.h

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump_data.h
22
22
 
23
23
#define DRIZZLE_MAX_LINE_LENGTH 1024*1024L-1025
24
24
#include "client_priv.h"
25
 
#include "server_detect.h"
26
25
#include <string>
27
26
#include <iostream>
28
27
#include <iomanip>
215
214
    drizzle_con_st connection;
216
215
    std::string hostName;
217
216
    bool drizzleProtocol;
218
 
    ServerDetect::server_type serverType;
219
 
    std::string serverVersion;
 
217
    int serverType;
220
218
 
221
219
  public:
 
220
    enum server_type {
 
221
      SERVER_MYSQL_FOUND,
 
222
      SERVER_DRIZZLE_FOUND,
 
223
      SERVER_UNKNOWN_FOUND
 
224
    };
222
225
    DrizzleDumpConnection(std::string &host, uint16_t port,
223
226
      std::string &username, std::string &password, bool drizzle_protocol);
224
227
    ~DrizzleDumpConnection();
241
244
    bool setDB(std::string databaseName);
242
245
    bool usingDrizzleProtocol(void) const { return drizzleProtocol; }
243
246
    bool getServerType(void) const { return serverType; }
244
 
    std::string getServerVersion(void) const { return serverVersion; }
 
247
    const char* getServerVersion(void) { return drizzle_con_server_version(&connection); }
245
248
};
246
249
 
247
250
class DrizzleStringBuf : public std::streambuf