← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/select_send.h

  • Committer: LinuxJedi
  • Date: 2010-08-12 17:36:08 UTC
  • mto: (1735.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1736.
  • Revision ID: linuxjedi@linuxjedi-laptop-20100812173608-ccr246iaa8gv3s97
Remove module pointer from registry when module doesn't load to avoid a double-free on shutdown.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/select_send.h
22
22
#define DRIZZLED_SELECT_SEND_H
23
23
 
24
24
#include <drizzled/plugin/client.h>
25
 
#include <drizzled/plugin/query_cache.h>
26
25
#include <drizzled/plugin/transactional_storage_engine.h>
27
26
 
28
27
namespace drizzled
49
48
    /* Unlock tables before sending packet to gain some speed */
50
49
    if (session->lock)
51
50
    {
52
 
      session->unlockTables(session->lock);
 
51
      mysql_unlock_tables(session, session->lock);
53
52
      session->lock= 0;
54
53
    }
55
54
    session->my_eof();
112
111
        break;
113
112
      }
114
113
    }
115
 
    /* Insert this record to the Resultset into the cache */
116
 
    if (session->query_cache_key != "" && session->getResultsetMessage() != NULL)
117
 
      plugin::QueryCache::insertRecord(session, items);
118
 
 
119
114
    session->sent_row_count++;
120
115
    if (session->is_error())
121
116
      return true;