~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/select_send.h

Fixed a style variance.

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/query_cache.h>
26
 
#include <drizzled/plugin/transactional_storage_engine.h>
27
25
 
28
26
namespace drizzled
29
27
{
44
42
      InnoDB adaptive hash S-latch to avoid thread deadlocks if it was reserved
45
43
      by session
46
44
    */
47
 
    plugin::TransactionalStorageEngine::releaseTemporaryLatches(session);
 
45
    plugin::StorageEngine::releaseTemporaryLatches(session);
48
46
 
49
47
    /* Unlock tables before sending packet to gain some speed */
50
48
    if (session->lock)
51
49
    {
52
 
      session->unlockTables(session->lock);
 
50
      mysql_unlock_tables(session, session->lock);
53
51
      session->lock= 0;
54
52
    }
55
53
    session->my_eof();
97
95
      InnoDB adaptive hash S-latch to avoid thread deadlocks if it was reserved
98
96
      by session
99
97
    */
100
 
    plugin::TransactionalStorageEngine::releaseTemporaryLatches(session);
 
98
    plugin::StorageEngine::releaseTemporaryLatches(session);
101
99
 
102
100
    List_iterator_fast<Item> li(items);
103
101
    char buff[MAX_FIELD_WIDTH];
112
110
        break;
113
111
      }
114
112
    }
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
113
    session->sent_row_count++;
120
114
    if (session->is_error())
121
115
      return true;