← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/include/innodb_trx_weight.inc

  • Committer: Monty Taylor
  • Date: 2009-05-09 22:13:47 UTC
  • mto: This revision was merged to the branch mainline in revision 1009.
  • Revision ID: mordred@inaugust.com-20090509221347-l712szviusbobro0
Re-added bitset<> as a replacement for Bitmap<>

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/include/innodb_trx_weight.inc
7
7
-- if ($con1_extra_sql_present) {
8
8
        -- eval $con1_extra_sql
9
9
-- }
 
10
-- if ($con1_extra_sql2_present) {
 
11
        -- eval $con1_extra_sql2
 
12
-- }
10
13
 
11
14
-- connection con2
12
15
SET autocommit=0;
25
28
        ROLLBACK;
26
29
 
27
30
        -- connection con1
28
 
        -- error ER_LOCK_DEADLOCK
29
31
        -- reap
30
32
-- }
31
33
# else
39
41
        ROLLBACK;
40
42
 
41
43
        -- connection con2
42
 
        -- error ER_LOCK_DEADLOCK
43
44
        -- reap
44
45
-- }
45
46