← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/innobase/mysql-test/innodb_trx_weight.inc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/mysql-test/innodb_trx_weight.inc
1
 
 
2
 
SET autocommit=0;
3
 
SELECT * FROM t1 FOR UPDATE;
4
 
        -- eval $con1_extra_sql
5
 
 
6
 
SET autocommit=0;
7
 
SELECT * FROM t2 FOR UPDATE;
8
 
        -- eval $con2_extra_sql
9
 
 
10
 
        -- connection con1
11
 
        -- send
12
 
        INSERT INTO t2 VALUES (0);
13
 
 
14
 
        -- connection con2
15
 
        INSERT INTO t1 VALUES (0);
16
 
        ROLLBACK;
17
 
 
18
 
        -- connection con1
19
 
        -- error ER_LOCK_DEADLOCK
20
 
        -- reap
21
 
# else
22
 
        -- connection con2
23
 
        -- send
24
 
        INSERT INTO t1 VALUES (0);
25
 
 
26
 
        -- connection con1
27
 
        INSERT INTO t2 VALUES (0);
28
 
        ROLLBACK;
29
 
 
30
 
        -- connection con2
31
 
        -- error ER_LOCK_DEADLOCK
32
 
        -- reap
33
 
 
34
 
 
35
 
DELETE FROM t5_nontrans;
36