~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/select_send.h

  • Committer: Monty Taylor
  • Date: 2010-03-11 18:27:20 UTC
  • mfrom: (1333 staging)
  • mto: This revision was merged to the branch mainline in revision 1348.
  • Revision ID: mordred@inaugust.com-20100311182720-hd1h87y6cb1b1mp0
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
#define DRIZZLED_SELECT_SEND_H
23
23
 
24
24
#include <drizzled/plugin/client.h>
 
25
#include <drizzled/plugin/transactional_storage_engine.h>
25
26
 
26
27
namespace drizzled
27
28
{
42
43
      InnoDB adaptive hash S-latch to avoid thread deadlocks if it was reserved
43
44
      by session
44
45
    */
45
 
    plugin::StorageEngine::releaseTemporaryLatches(session);
 
46
    plugin::TransactionalStorageEngine::releaseTemporaryLatches(session);
46
47
 
47
48
    /* Unlock tables before sending packet to gain some speed */
48
49
    if (session->lock)
95
96
      InnoDB adaptive hash S-latch to avoid thread deadlocks if it was reserved
96
97
      by session
97
98
    */
98
 
    plugin::StorageEngine::releaseTemporaryLatches(session);
 
99
    plugin::TransactionalStorageEngine::releaseTemporaryLatches(session);
99
100
 
100
101
    List_iterator_fast<Item> li(items);
101
102
    char buff[MAX_FIELD_WIDTH];