← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/transaction_log/utilities/transaction_log_connection.cc

  • Committer: Lee Bieber
  • Date: 2011-03-04 23:51:48 UTC
  • mfrom: (2219.1.2 build)
  • Revision ID: kalebral@gmail.com-20110304235148-g7sawtycktp1vz74
Merge Shrews - 729372: Semicolon causing slave plugin to stop replicating
Merge Andrew - 728990: libdrizzle: Re-using a result struct without freeing causes infinite loop

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/transaction_log/utilities/transaction_log_connection.cc
55
55
                                     drizzle_result_st *result)
56
56
{
57
57
  drizzle_return_t ret;
58
 
  drizzle_result_create(&connection, result);
59
58
  if (drizzle_query_str(&connection, result, str_query.c_str(), &ret) == NULL ||
60
59
      ret != DRIZZLE_RETURN_OK)
61
60
  {
69
68
    {
70
69
      cerr << "Error executing query: " <<
71
70
        drizzle_con_error(&connection) << endl;
 
71
      drizzle_result_free(result);
72
72
    }
73
73
    return;
74
74
  }
77
77
  {
78
78
    cerr << "Could not buffer result: " <<
79
79
        drizzle_con_error(&connection) << endl;
 
80
    drizzle_result_free(result);
80
81
    return;
81
82
  }
82
83
  return;