← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump_data.h

  • Committer: Brian Aker
  • Date: 2011-11-26 23:14:59 UTC
  • mto: This revision was merged to the branch mainline in revision 2465.
  • Revision ID: brian@tangent.org-20111126231459-pa9i3arizevf0vlr
Remove con from being passed object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump_data.h
213
213
{
214
214
  private:
215
215
    drizzle_st *drizzle;
216
 
    drizzle_con_st connection;
 
216
    drizzle_con_st *connection;
217
217
    std::string hostName;
218
218
    bool drizzleProtocol;
219
219
    ServerDetect::server_type serverType;
220
220
    std::string serverVersion;
221
221
 
222
222
  public:
223
 
    DrizzleDumpConnection(std::string &host, uint16_t port,
224
 
      std::string &username, std::string &password, bool drizzle_protocol);
 
223
    DrizzleDumpConnection(std::string &host,
 
224
                          uint16_t port,
 
225
                          std::string &username,
 
226
                          std::string &password,
 
227
                          bool drizzle_protocol);
 
228
 
225
229
    ~DrizzleDumpConnection();
 
230
 
226
231
    void errorHandler(drizzle_result_st *res,  drizzle_return_t ret, const char *when);
227
232
    drizzle_result_st* query(std::string &str_query);
228
233
    bool queryNoResult(std::string &str_query);
232
237
      std::string str_query(ch_query);
233
238
      return query(str_query);
234
239
    }
 
240
 
235
241
    bool queryNoResult(const char* ch_query)
236
242
    {
237
243
      std::string str_query(ch_query);
263
269
    void writeString(std::string &str)
264
270
    {
265
271
      if (not connection->queryNoResult(str))
 
272
      {
266
273
        throw std::exception();
 
274
      }
267
275
    }
268
276
 
269
277
    void setConnection(DrizzleDumpConnection *conn) { connection= conn; }