← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.cc

  • Committer: Lee Bieber
  • Date: 2010-10-26 14:51:47 UTC
  • mfrom: (1879.1.3 build)
  • Revision ID: kalebral@gmail.com-20101026145147-yqop1w9qw7watara
Merge Monty - clean up of set_var and sys_var
Merge Monty - Generate ChangeLog from bzr as part of distcheck. Also, cleaned up AUTHORS file from bzr log parsed by hand.
Merge Shrews - update transaction log documentation

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cursor.cc
304
304
  @verbatim 1,5,15,25,35,... @endverbatim
305
305
*/
306
306
inline uint64_t
307
 
compute_next_insert_id(uint64_t nr,struct system_variables *variables)
 
307
compute_next_insert_id(uint64_t nr, drizzle_system_variables *variables)
308
308
{
309
309
  if (variables->auto_increment_increment == 1)
310
310
    return (nr+1); // optimization of the formula below
344
344
    The number X if it exists, "nr" otherwise.
345
345
*/
346
346
inline uint64_t
347
 
prev_insert_id(uint64_t nr, struct system_variables *variables)
 
347
prev_insert_id(uint64_t nr, drizzle_system_variables *variables)
348
348
{
349
349
  if (unlikely(nr < variables->auto_increment_offset))
350
350
  {
442
442
  uint64_t nr, nb_reserved_values;
443
443
  bool append= false;
444
444
  Session *session= getTable()->in_use;
445
 
  struct system_variables *variables= &session->variables;
 
445
  drizzle_system_variables *variables= &session->variables;
446
446
 
447
447
  /*
448
448
    next_insert_id is a "cursor" into the reserved interval, it may go greater