← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/include/mix1.inc

  • Committer: Lee Bieber
  • Date: 2011-01-21 05:20:24 UTC
  • mfrom: (2099.1.3 build)
  • Revision ID: kalebral@gmail.com-20110121052024-43pl0aj8j5fmqnvl
Merge Stewart - Fix bug 664222: DDL operations have an implicit commit
Merge Stewart - Fix bug #695201: autocommit=1 not resetting session->server_status properly when committing ongoing txn
Add BSD copyright file to win32/config.h
Merge Brian - cleanup user_locks.kill_wait test

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/include/mix1.inc
653
653
CREATE TABLE t2 (a int, b int, primary key (a));
654
654
BEGIN;
655
655
INSERT INTO t2 values(100,100);
 
656
COMMIT;
656
657
--error ER_DUP_ENTRY
657
658
CREATE TABLE IF NOT EXISTS t2 (primary key (a)) select * from t1;
658
659
SELECT * from t2;