← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/slave/queue_producer.cc

  • Committer: Brian Aker
  • Date: 2011-11-24 00:05:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2465.
  • Revision ID: brian@tangent.org-20111124000544-186obn61qr3b7r9x
First pass, drizzle_create() no longer takes an argument. This means that we can now change drizzle_st without being concerned about ABI.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/slave/queue_producer.cc
133
133
 
134
134
bool QueueProducer::openConnection()
135
135
{
136
 
  if (drizzle_create(&_drizzle) == NULL)
 
136
  if ((_drizzle= drizzle_create()) == NULL)
137
137
  {
138
138
    _last_return= DRIZZLE_RETURN_INTERNAL_ERROR;
139
139
    _last_error_message= "Replication slave: ";
140
 
    _last_error_message.append(drizzle_error(&_drizzle));
 
140
    _last_error_message.append(drizzle_error(_drizzle));
141
141
    errmsg_printf(error::ERROR, _("%s"), _last_error_message.c_str());
142
142
    return false;
143
143
  }
144
144
  
145
 
  if (drizzle_con_create(&_drizzle, &_connection) == NULL)
 
145
  if (drizzle_con_create(_drizzle, &_connection) == NULL)
146
146
  {
147
147
    _last_return= DRIZZLE_RETURN_INTERNAL_ERROR;
148
148
    _last_error_message= "Replication slave: ";
149
 
    _last_error_message.append(drizzle_error(&_drizzle));
 
149
    _last_error_message.append(drizzle_error(_drizzle));
150
150
    errmsg_printf(error::ERROR, _("%s"), _last_error_message.c_str());
151
151
    return false;
152
152
  }
160
160
  {
161
161
    _last_return= ret;
162
162
    _last_error_message= "Replication slave: ";
163
 
    _last_error_message.append(drizzle_error(&_drizzle));
 
163
    _last_error_message.append(drizzle_error(_drizzle));
164
164
    errmsg_printf(error::ERROR, _("%s"), _last_error_message.c_str());
165
165
    return false;
166
166
  }
252
252
  {
253
253
    _last_return= ret;
254
254
    _last_error_message= "Replication slave: ";
255
 
    _last_error_message.append(drizzle_error(&_drizzle));
 
255
    _last_error_message.append(drizzle_error(_drizzle));
256
256
    errmsg_printf(error::ERROR, _("%s"), _last_error_message.c_str());
257
257
    drizzle_result_free(&result);
258
258
    return false;
264
264
  {
265
265
    _last_return= ret;
266
266
    _last_error_message= "Replication slave: ";
267
 
    _last_error_message.append(drizzle_error(&_drizzle));
 
267
    _last_error_message.append(drizzle_error(_drizzle));
268
268
    errmsg_printf(error::ERROR, _("%s"), _last_error_message.c_str());
269
269
    drizzle_result_free(&result);
270
270
    return false;
424
424
  {
425
425
    _last_return= ret;
426
426
    _last_error_message= "Replication slave: ";
427
 
    _last_error_message.append(drizzle_error(&_drizzle));
 
427
    _last_error_message.append(drizzle_error(_drizzle));
428
428
    errmsg_printf(error::ERROR, _("%s"), _last_error_message.c_str());
429
429
    drizzle_result_free(&result);
430
430
    return ER_YES;
438
438
  {
439
439
    _last_return= ret;
440
440
    _last_error_message= "Replication slave: ";
441
 
    _last_error_message.append(drizzle_error(&_drizzle));
 
441
    _last_error_message.append(drizzle_error(_drizzle));
442
442
    errmsg_printf(error::ERROR, _("%s"), _last_error_message.c_str());
443
443
    drizzle_result_free(&result);
444
444
    return ER_YES;