← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cursor.cc
27
27
 
28
28
#include <fcntl.h>
29
29
 
30
 
#include "mysys/hash.h"
 
30
#include "drizzled/my_hash.h"
31
31
#include "drizzled/error.h"
32
32
#include "drizzled/gettext.h"
33
33
#include "drizzled/probes.h"
43
43
#include "drizzled/field/timestamp.h"
44
44
#include "drizzled/message/table.pb.h"
45
45
#include "drizzled/plugin/client.h"
 
46
#include "drizzled/internal/my_sys.h"
46
47
 
47
48
using namespace std;
48
49
using namespace drizzled;
50
51
/****************************************************************************
51
52
** General Cursor functions
52
53
****************************************************************************/
 
54
Cursor::Cursor(drizzled::plugin::StorageEngine &engine_arg,
 
55
               TableShare &share_arg)
 
56
  : table_share(&share_arg), table(0),
 
57
    estimation_rows_to_insert(0), engine(&engine_arg),
 
58
    ref(0), in_range_check_pushed_down(false),
 
59
    key_used_on_scan(MAX_KEY), active_index(MAX_KEY),
 
60
    ref_length(sizeof(my_off_t)),
 
61
    inited(NONE),
 
62
    locked(false), implicit_emptied(0),
 
63
    next_insert_id(0), insert_id_for_cur_row(0)
 
64
{ }
 
65
 
53
66
Cursor::~Cursor(void)
54
67
{
55
68
  assert(locked == false);
199
212
  }
200
213
  if (error)
201
214
  {
202
 
    my_errno= error;                            /* Safeguard */
 
215
    errno= error;                            /* Safeguard */
203
216
  }
204
217
  else
205
218
  {