← 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-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:
plugin/slave/queue_producer.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
 
21
#include <config.h>
 
22
 
21
23
#include <plugin/slave/queue_producer.h>
22
24
#include <drizzled/errmsg_print.h>
23
25
#include <drizzled/sql/result_set.h>
142
144
    return false;
143
145
  }
144
146
  
145
 
  if (drizzle_con_create(_drizzle, &_connection) == NULL)
 
147
  if ((_connection= drizzle_con_create(_drizzle)) == NULL)
146
148
  {
147
149
    _last_return= DRIZZLE_RETURN_INTERNAL_ERROR;
148
150
    _last_error_message= "Replication slave: ";
151
153
    return false;
152
154
  }
153
155
  
154
 
  drizzle_con_set_tcp(&_connection, _master_host.c_str(), _master_port);
155
 
  drizzle_con_set_auth(&_connection, _master_user.c_str(), _master_pass.c_str());
 
156
  drizzle_con_set_tcp(_connection, _master_host.c_str(), _master_port);
 
157
  drizzle_con_set_auth(_connection, _master_user.c_str(), _master_pass.c_str());
156
158
 
157
 
  drizzle_return_t ret= drizzle_con_connect(&_connection);
 
159
  drizzle_return_t ret= drizzle_con_connect(_connection);
158
160
 
159
161
  if (ret != DRIZZLE_RETURN_OK)
160
162
  {
177
179
 
178
180
  _is_connected= false;
179
181
 
180
 
  if (drizzle_quit(&_connection, &result, &ret) == NULL)
 
182
  if (drizzle_quit(_connection, &result, &ret) == NULL)
181
183
  {
182
184
    _last_return= ret;
183
185
    drizzle_result_free(&result);
246
248
 
247
249
  drizzle_return_t ret;
248
250
  drizzle_result_st result;
249
 
  drizzle_query_str(&_connection, &result, sql.c_str(), &ret);
 
251
  drizzle_query_str(_connection, &result, sql.c_str(), &ret);
250
252
  
251
253
  if (ret != DRIZZLE_RETURN_OK)
252
254
  {
418
420
 
419
421
  drizzle_return_t ret;
420
422
  drizzle_result_st result;
421
 
  drizzle_query_str(&_connection, &result, sql.c_str(), &ret);
 
423
  drizzle_query_str(_connection, &result, sql.c_str(), &ret);
422
424
  
423
425
  if (ret != DRIZZLE_RETURN_OK)
424
426
  {