← Back to branch summary

~jaypipes/drizzle/split-xa-resource-manager

« back to all changes in this revision

Viewing changes to drizzled/cursor.cc

  • Committer: Jay Pipes
  • Date: 2010-02-06 01:51:20 UTC
  • mfrom: (1273.1.10 build)
  • Revision ID: jpipes@serialcoder-20100206015120-as4vb638inbzrb59
Merge trunk changes and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cursor.cc
46
46
#include "drizzled/transaction_services.h"
47
47
 
48
48
using namespace std;
49
 
using namespace drizzled;
 
49
 
 
50
namespace drizzled
 
51
{
50
52
 
51
53
/****************************************************************************
52
54
** General Cursor functions
53
55
****************************************************************************/
54
 
Cursor::Cursor(drizzled::plugin::StorageEngine &engine_arg,
 
56
Cursor::Cursor(plugin::StorageEngine &engine_arg,
55
57
               TableShare &share_arg)
56
58
  : table_share(&share_arg), table(0),
57
59
    estimation_rows_to_insert(0), engine(&engine_arg),
58
60
    ref(0), in_range_check_pushed_down(false),
59
61
    key_used_on_scan(MAX_KEY), active_index(MAX_KEY),
60
 
    ref_length(sizeof(my_off_t)),
 
62
    ref_length(sizeof(internal::my_off_t)),
61
63
    inited(NONE),
62
64
    locked(false), implicit_emptied(0),
63
65
    next_insert_id(0), insert_id_for_cur_row(0)
1570
1572
 
1571
1573
  return 0;
1572
1574
}
 
1575
 
 
1576
} /* namespace drizzled */