← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/r/transaction.result

  • Committer: Lee Bieber
  • Date: 2010-12-15 16:23:36 UTC
  • mfrom: (1995.1.2 build)
  • Revision ID: kalebral@gmail.com-20101215162336-juntyt4gw4vgohg4
Merge Andrew - fix bug 628912: Crash / segfault in drizzled::Item_func::arguments (this=0x35) at ./drizzled/function/func.h
Merge Andrew - 663919: next query after KILL QUERY will error

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/r/transaction.result
26
26
key1    value1
27
27
key2    value2
28
28
START TRANSACTION;
29
 
Warnings:
30
 
Warning 1746    There is already a transaction in progress
31
29
INSERT INTO t1_trx VALUES ('key1','value1');
32
30
INSERT INTO t1_trx VALUES ('key2','value2');
33
31
SELECT t1_trx.k, t1_trx.v
41
39
FROM t1_trx
42
40
INNER JOIN t1_non_trx ON t1_trx.k = t1_non_trx.k;
43
41
k       v
44
 
COMMIT;
45
42
DROP TABLE t1_trx;
46
43
DROP TABLE t1_non_trx;