← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysql-test/include/innodb_trx_weight.inc

Renamed more stuff to drizzle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/include/innodb_trx_weight.inc
7
7
-- if ($con1_extra_sql_present) {
8
8
        -- eval $con1_extra_sql
9
9
-- }
10
 
        -- eval $con1_extra_sql2
11
10
 
12
11
-- connection con2
13
12
SET autocommit=0;
28
25
        ROLLBACK;
29
26
 
30
27
        -- connection con1
 
28
        -- error ER_LOCK_DEADLOCK
31
29
        -- reap
32
30
-- }
33
31
# else
41
39
        ROLLBACK;
42
40
 
43
41
        -- connection con2
 
42
        -- error ER_LOCK_DEADLOCK
44
43
        -- reap
45
44
-- }
46
45
 
47
46
-- connection default
48
47
 
49
 
DROP TABLE t5_nontrans;
50
 
CREATE TABLE t5_nontrans (a INT) ENGINE=ARCHIVE;
 
48
DELETE FROM t5_nontrans;
51
49
 
52
50
-- disconnect con1
53
51
-- disconnect con2