← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Jay Pipes
  • Date: 2009-02-04 15:44:25 UTC
  • mfrom: (829 drizzle)
  • mto: This revision was merged to the branch mainline in revision 830.
  • Revision ID: jpipes@serialcoder-20090204154425-th8xfk2ujz2y8xwg
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
25
25
 
26
26
#include <drizzled/global.h>
27
27
#include <drizzled/protocol.h>
28
 
#include <libdrizzle/password.h>     // rand_struct
 
28
#include <libdrizzleclient/password.h>     // rand_struct
29
29
#include <drizzled/sql_locale.h>
30
30
#include <drizzled/ha_trx_info.h>
31
31
#include <mysys/my_tree.h>
127
127
  uint64_t tmp_table_size;
128
128
  ha_rows select_limit;
129
129
  ha_rows max_join_size;
130
 
  uint32_t auto_increment_increment;
131
 
  uint32_t auto_increment_offset;
 
130
  uint64_t auto_increment_increment;
 
131
  uint64_t auto_increment_offset;
132
132
  uint64_t bulk_insert_buff_size;
133
133
  uint64_t join_buff_size;
134
134
  uint32_t max_allowed_packet;
1171
1171
    enter_cond(); this mutex is then released by exit_cond().
1172
1172
    Usage must be: lock mutex; enter_cond(); your code; exit_cond().
1173
1173
  */
1174
 
  inline const char* enter_cond(pthread_cond_t *cond, pthread_mutex_t* mutex,
1175
 
                          const char* msg)
 
1174
  inline const char* enter_cond(pthread_cond_t *cond, pthread_mutex_t* mutex, const char* msg)
1176
1175
  {
1177
1176
    const char* old_msg = get_proc_info();
1178
1177
    safe_mutex_assert_owner(mutex);
1478
1477
    unit= u;
1479
1478
    return 0;
1480
1479
  }
1481
 
  virtual int prepare2(void) { return 0; }
1482
1480
  /*
1483
1481
    Because of peculiarities of prepared statements protocol
1484
1482
    we need to know number of columns in the result set (if