← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/insert.cc

[patch 003/129] Merge patch for revision 1788 from InnoDB SVN:
revno: 1788
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5670
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5663
committer: marko
timestamp: Wed 2009-08-12 12:16:37 +0000
message:
  branches/zip: trx_undo_rec_copy(): Add const qualifier to undo_rec.
  This is a non-functional change.
modified:
  include/trx0rec.h              2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Ftrx0rec.h
  include/trx0rec.ic             2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Ftrx0rec.ic
  trx/trx0rec.c                  2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Ftrx%2Ftrx0rec.c
diff:
=== modified file 'include/trx0rec.h'

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/insert.cc
40
40
    return true;
41
41
  }
42
42
 
43
 
  if (! (need_start_waiting= ! session->wait_if_global_read_lock(false, true)))
 
43
  if (! (need_start_waiting= ! wait_if_global_read_lock(session, 0, 1)))
44
44
  {
45
45
    return true;
46
46
  }
47
47
 
48
 
  DRIZZLE_INSERT_START(session->getQueryString()->c_str());
 
48
  DRIZZLE_INSERT_START(session->query.c_str());
49
49
 
50
50
  bool res= mysql_insert(session,
51
51
                         all_tables,
59
59
     Release the protection against the global read lock and wake
60
60
     everyone, who might want to set a global read lock.
61
61
   */
62
 
  session->startWaitingGlobalReadLock();
63
 
 
 
62
  start_waiting_global_read_lock(session);
64
63
  return res;
65
64
}
66
65