Merge lp:~stewart/drizzle/remove-ddl-implicit-commit into lp:drizzle/7.0

[Stewart Smith]

makes DDL operations error out if attempted to be performed within a ongoing transaction

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/696/

[Brian Aker (brianaker)]

Hi!

=====
- byte.resize(sizeof("START TRANSACTION")); // +1 for the COM_QUERY, provided by null count from sizeof()
71 + byte.resize(sizeof("SET AUTOCOMMIT=0")); // +1 for the COM_QUERY, provided by null count from sizeof()
=====

You need to fix this so that the transaction works.

Cheers,
   -Brian

review: Needs Fixing

[Stewart Smith (stewart)]

I can only change this back so that DDL is impossible to do with EXECUTE (it will fail *SILENTLY*). Important to note when documenting EXECUTE.

[lp:~stewart/drizzle/remove-ddl-implicit-commit]

1940. By Stewart Smith on 2011-01-06

merge trunk

1941. By Stewart Smith on 2011-01-06

revert patch that changed EXECUTE to use AUTOCOMMIT=0 instead of START TRANSACTION. Of course, this means that you cannot do DDL inside EXECUTE, so change the test and result for execute_wait test which did that.

1942. By Stewart Smith on 2011-01-06

add test for EXECUTE WAIT doing DDL that will actually do the DDL - run a COMMIT first.

1943. By Stewart Smith on 2011-01-21

merge trunk

Unmerged revisions

=== modified file 'docs/transactional.rst'
--- docs/transactional.rst	2010-12-19 22:50:00 +0000
+++ docs/transactional.rst	2011-01-06 13:49:38 +0000
@@ -6,19 +6,25 @@
 
    start_transaction
    commit
-   rollback 
+   rollback
    savepoints
 
 The essence of a transaction is that it groups multiple steps into a single, all-or-nothing operation. Drizzle is a transactional database by default and by design, meaning that changes and queries to the database appear to be Atomic, Consistent, Isolated, and Durable (ACID). This means that Drizzle implements `serializable <http://en.wikipedia.org/wiki/Serializability>`_, ACID transactions, even if the transaction is interrupted.
 
+NOTE: Drizzle still supports non-transactional storage engines, and if these are used then you will not get transactional behaviour with them. The default engine is transactional.
+
 It collects operations that form tasks and stores them as a single operation, or if that operation is not possible it removes all changes attempted. Transactions are controlled via START TRANSACTION, ROLLBACK, and COMMIT. Savepoints are implemented to allow for a low leverl of granulairty.
 
 A COMMIT statement ends a transaction within Drizzle and makes all changes visible to other users.  The order of events is typically to issue a START TRANSACTION statement, execute one or more SQL statements, and then issue a COMMIT statement. Alternatively, a ROLLBACK statement can be issued, which undoes all the work performed since START TRANSACTION was issued. A COMMIT statement will also release any existing savepoints that may be in use.
 
-Drizzle can operate in an autocommit mode, where each statement is committed, via: ::
+Drizzle can operate in an autocommit mode, where each statement is committed at the end of statement, via: ::
 
 	SET AUTOCOMMIT= 1
 
+If you set AUTOCOMMIT=1 during a transaction, that transaction will be committed as part of the SET AUTOCOMMIT=1 statement.
+
+Transactional DDL is currently not supported, although it may be in the future. This means that although currently you will get a ER_TRANSACTION_DDL_NOT_SUPPORTED error message if you try and execute DDL statements within a transaction, in future versions of Drizzle they may succeed.
+
 Currently DDL operations are performed as a single transaction, this limitation will be lifted in the future.
 
 

=== modified file 'drizzled/error.cc'
--- drizzled/error.cc	2011-01-04 23:23:25 +0000
+++ drizzled/error.cc	2011-01-06 13:49:38 +0000
@@ -529,6 +529,8 @@
   ADD_ERROR_MESSAGE(ER_INVALID_BOOLEAN_VALUE, N_("Received an invalid BOOLEAN value '%s'."));
   ADD_ERROR_MESSAGE(ER_INVALID_CAST_TO_BOOLEAN, N_("Invalid cast to BOOLEAN: '%s'."));
 
+  // Transactional DDL
+  ADD_ERROR_MESSAGE(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, N_("Transactional DDL not supported"));
   // ASSERT Message
   ADD_ERROR_MESSAGE(ER_ASSERT, N_("Assertion '%s' failed."));
   ADD_ERROR_MESSAGE(ER_ASSERT_NULL, N_("Assertion '%s' failed, the result was NULL."));

=== modified file 'drizzled/error_t.h'
--- drizzled/error_t.h	2011-01-04 23:23:25 +0000
+++ drizzled/error_t.h	2011-01-06 13:49:38 +0000
@@ -784,10 +784,10 @@
   ER_ASSERT_NULL,
   ER_TABLE_DROP,
   ER_INVALID_CAST_TO_BOOLEAN,
-
+  ER_TRANSACTIONAL_DDL_NOT_SUPPORTED,
   // Leave ER_INVALID_BOOLEAN_VALUE as LAST, and force people to use tags
   // instead of numbers in error messages in test.
-  ER_ERROR_LAST= ER_INVALID_CAST_TO_BOOLEAN
+  ER_ERROR_LAST=   ER_TRANSACTIONAL_DDL_NOT_SUPPORTED
 };
 
 

=== modified file 'drizzled/statement/alter_schema.cc'
--- drizzled/statement/alter_schema.cc	2011-01-04 18:14:33 +0000
+++ drizzled/statement/alter_schema.cc	2011-01-06 13:49:38 +0000
@@ -59,9 +59,7 @@
 
   if (session->inTransaction())
   {
-    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, 
-               ER(ER_LOCK_OR_ACTIVE_TRANSACTION), 
-               MYF(0));
+    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
     return true;
   }
   /*

=== modified file 'drizzled/statement/alter_table.cc'
--- drizzled/statement/alter_table.cc	2010-12-24 07:15:43 +0000
+++ drizzled/statement/alter_table.cc	2011-01-06 13:49:38 +0000
@@ -136,9 +136,11 @@
   if (not validateCreateTableOption())
     return true;
 
-  /* ALTER TABLE ends previous transaction */
-  if (not session->endActiveTransaction())
+  if (session->inTransaction())
+  {
+    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
     return true;
+  }
 
   if (not (need_start_waiting= not session->wait_if_global_read_lock(0, 1)))
     return true;

=== modified file 'drizzled/statement/create_index.cc'
--- drizzled/statement/create_index.cc	2010-12-18 04:43:40 +0000
+++ drizzled/statement/create_index.cc	2011-01-06 13:49:38 +0000
@@ -56,8 +56,9 @@
   */
 
   assert(first_table == all_tables && first_table != 0);
-  if (! session->endActiveTransaction())
+  if (session->inTransaction())
   {
+    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
     return true;
   }
 

=== modified file 'drizzled/statement/create_schema.cc'
--- drizzled/statement/create_schema.cc	2010-12-24 07:15:43 +0000
+++ drizzled/statement/create_schema.cc	2011-01-06 13:49:38 +0000
@@ -38,8 +38,9 @@
   if (not validateSchemaOptions())
     return true;
 
-  if (not session->endActiveTransaction())
+  if (session->inTransaction())
   {
+    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
     return true;
   }
 

=== modified file 'drizzled/statement/create_table.cc'
--- drizzled/statement/create_table.cc	2010-12-24 07:15:43 +0000
+++ drizzled/statement/create_table.cc	2011-01-06 13:49:38 +0000
@@ -67,12 +67,11 @@
     return true;
   }
 
-
-  /* If CREATE TABLE of non-temporary table, do implicit commit */
   if (not lex_identified_temp_table)
   {
-    if (not session->endActiveTransaction())
+    if (session->inTransaction())
     {
+      my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
       return true;
     }
   }

=== modified file 'drizzled/statement/drop_index.cc'
--- drizzled/statement/drop_index.cc	2010-12-18 04:43:40 +0000
+++ drizzled/statement/drop_index.cc	2011-01-06 13:49:38 +0000
@@ -58,8 +58,9 @@
   HA_CREATE_INFO create_info;
 
   assert(first_table == all_tables && first_table != 0);
-  if (! session->endActiveTransaction())
+  if (session->inTransaction())
   {
+    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
     return true;
   }
 

=== modified file 'drizzled/statement/drop_schema.cc'
--- drizzled/statement/drop_schema.cc	2011-01-04 18:14:33 +0000
+++ drizzled/statement/drop_schema.cc	2011-01-06 13:49:38 +0000
@@ -34,10 +34,12 @@
 
 bool statement::DropSchema::execute()
 {
-  if (! session->endActiveTransaction())
+  if (session->inTransaction())
   {
+    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
     return true;
   }
+
   SchemaIdentifier schema_identifier(string(session->lex->name.str, session->lex->name.length));
   if (not check_db_name(session, schema_identifier))
   {
@@ -45,14 +47,7 @@
 
     return false;
   }
-  if (session->inTransaction())
-  {
-    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, 
-        ER(ER_LOCK_OR_ACTIVE_TRANSACTION), 
-        MYF(0));
-    return true;
-  }
-  
+
   bool res = true;
   std::string path;
   schema_identifier.getSQLPath(path);

=== modified file 'drizzled/statement/drop_table.cc'
--- drizzled/statement/drop_table.cc	2010-12-31 02:23:39 +0000
+++ drizzled/statement/drop_table.cc	2011-01-06 13:49:38 +0000
@@ -93,8 +93,9 @@
 
   if (not drop_temporary)
   {
-    if (not session->endActiveTransaction())
+    if (session->inTransaction())
     {
+      my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
       return true;
     }
   }

=== modified file 'drizzled/statement/rename_table.cc'
--- drizzled/statement/rename_table.cc	2010-12-24 07:15:43 +0000
+++ drizzled/statement/rename_table.cc	2011-01-06 13:49:38 +0000
@@ -35,6 +35,13 @@
   TableList *all_tables= session->lex->query_tables;
   assert(first_table == all_tables && first_table != 0);
   TableList *table;
+
+  if (session->inTransaction())
+  {
+    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
+    return true;
+  }
+
   for (table= first_table; table; table= table->next_local->next_local)
   {
     TableList old_list, new_list;
@@ -46,7 +53,7 @@
     new_list= table->next_local[0];
   }
 
-  if (! session->endActiveTransaction() || renameTables(first_table))
+  if (renameTables(first_table))
   {
     return true;
   }

=== modified file 'drizzled/statement/truncate.cc'
--- drizzled/statement/truncate.cc	2010-12-24 07:15:43 +0000
+++ drizzled/statement/truncate.cc	2011-01-06 13:49:38 +0000
@@ -29,22 +29,14 @@
 bool statement::Truncate::execute()
 {
   TableList *first_table= (TableList *) session->lex->select_lex.table_list.first;
-  if (! session->endActiveTransaction())
-  {
-    return true;
-  }
-  /*
-   * Don't allow this within a transaction because we want to use
-   * re-generate table
-   */
+
   if (session->inTransaction())
   {
-    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, 
-               ER(ER_LOCK_OR_ACTIVE_TRANSACTION), 
-               MYF(0));
+    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
     return true;
   }
 
+
   return truncate(*session, first_table);
 }
 

=== modified file 'drizzled/sys_var.cc'
--- drizzled/sys_var.cc	2011-01-02 18:08:34 +0000
+++ drizzled/sys_var.cc	2011-01-06 13:49:38 +0000
@@ -1395,31 +1395,40 @@
 
 static bool set_option_autocommit(Session *session, set_var *var)
 {
+  bool success= true;
   /* The test is negative as the flag we use is NOT autocommit */
 
   uint64_t org_options= session->options;
+  uint64_t new_options= session->options;
 
   if (var->save_result.uint32_t_value != 0)
-    session->options&= ~((sys_var_session_bit*) var->var)->bit_flag;
+    new_options&= ~((sys_var_session_bit*) var->var)->bit_flag;
   else
-    session->options|= ((sys_var_session_bit*) var->var)->bit_flag;
+    new_options|= ((sys_var_session_bit*) var->var)->bit_flag;
 
-  if ((org_options ^ session->options) & OPTION_NOT_AUTOCOMMIT)
+  if ((org_options ^ new_options) & OPTION_NOT_AUTOCOMMIT)
   {
     if ((org_options & OPTION_NOT_AUTOCOMMIT))
     {
+      success= session->endActiveTransaction();
       /* We changed to auto_commit mode */
       session->options&= ~(uint64_t) (OPTION_BEGIN);
       session->server_status|= SERVER_STATUS_AUTOCOMMIT;
-      TransactionServices &transaction_services= TransactionServices::singleton();
-      if (transaction_services.commitTransaction(session, true))
-        return 1;
     }
     else
     {
       session->server_status&= ~SERVER_STATUS_AUTOCOMMIT;
     }
   }
+
+  if (var->save_result.uint32_t_value != 0)
+    session->options&= ~((sys_var_session_bit*) var->var)->bit_flag;
+  else
+    session->options|= ((sys_var_session_bit*) var->var)->bit_flag;
+
+  if (not success)
+    return true;
+
   return 0;
 }
 

=== modified file 'plugin/haildb/tests/r/trx_isolation_read_uncommitted.result'
--- plugin/haildb/tests/r/trx_isolation_read_uncommitted.result	2010-05-31 06:30:16 +0000
+++ plugin/haildb/tests/r/trx_isolation_read_uncommitted.result	2011-01-06 13:49:38 +0000
@@ -29,4 +29,5 @@
 a
 1
 2
+COMMIT;
 DROP TABLE t1;

=== modified file 'plugin/haildb/tests/r/trx_isolation_repeatable_read.result'
--- plugin/haildb/tests/r/trx_isolation_repeatable_read.result	2010-05-31 06:30:16 +0000
+++ plugin/haildb/tests/r/trx_isolation_repeatable_read.result	2011-01-06 13:49:38 +0000
@@ -22,4 +22,5 @@
 a
 1
 2
+COMMIT;
 DROP TABLE t1;

=== modified file 'plugin/haildb/tests/r/trx_isolation_serializable.result'
--- plugin/haildb/tests/r/trx_isolation_serializable.result	2010-05-31 09:08:00 +0000
+++ plugin/haildb/tests/r/trx_isolation_serializable.result	2011-01-06 13:49:38 +0000
@@ -22,4 +22,5 @@
 a
 1
 2
+COMMIT;
 DROP TABLE t1;

=== modified file 'plugin/haildb/tests/t/trx_isolation_read_uncommitted.test'
--- plugin/haildb/tests/t/trx_isolation_read_uncommitted.test	2010-05-31 06:30:16 +0000
+++ plugin/haildb/tests/t/trx_isolation_read_uncommitted.test	2011-01-06 13:49:38 +0000
@@ -30,6 +30,7 @@
 BEGIN;
 SELECT * from t1 order by a;
 
+COMMIT;
 DROP TABLE t1;
 
 disconnect a;

=== modified file 'plugin/haildb/tests/t/trx_isolation_repeatable_read.test'
--- plugin/haildb/tests/t/trx_isolation_repeatable_read.test	2010-05-31 06:30:16 +0000
+++ plugin/haildb/tests/t/trx_isolation_repeatable_read.test	2011-01-06 13:49:38 +0000
@@ -30,6 +30,7 @@
 BEGIN;
 SELECT * from t1 order by a;
 
+COMMIT;
 DROP TABLE t1;
 
 disconnect a;

=== modified file 'plugin/haildb/tests/t/trx_isolation_serializable.test'
--- plugin/haildb/tests/t/trx_isolation_serializable.test	2010-05-31 09:08:00 +0000
+++ plugin/haildb/tests/t/trx_isolation_serializable.test	2011-01-06 13:49:38 +0000
@@ -30,6 +30,7 @@
 BEGIN;
 SELECT * from t1 order by a;
 
+COMMIT;
 DROP TABLE t1;
 
 disconnect a;

=== modified file 'plugin/innobase/tests/r/innodb-semi-consistent.result'
--- plugin/innobase/tests/r/innodb-semi-consistent.result	2010-09-12 14:34:27 +0000
+++ plugin/innobase/tests/r/innodb-semi-consistent.result	2011-01-06 13:49:38 +0000
@@ -34,5 +34,6 @@
 10
 11
 7
+commit;
 drop table t1;
 SET GLOBAL innodb_lock_wait_timeout=@orig_lock_wait_timeout ;

=== modified file 'plugin/innobase/tests/r/innodb.result'
--- plugin/innobase/tests/r/innodb.result	2010-12-08 21:50:36 +0000
+++ plugin/innobase/tests/r/innodb.result	2011-01-06 13:49:38 +0000
@@ -331,11 +331,12 @@
 commit;
 select * from t1;
 id	val
+commit;
 drop table t1;
 create table t1 (a integer) engine=innodb;
-start transaction;
 rename table t1 to t2;
 create table t1 (b integer) engine=innodb;
+start transaction;
 insert into t1 values (1);
 rollback;
 drop table t1;
@@ -358,6 +359,7 @@
 SELECT _userid FROM t1 WHERE _userid='[e-mail]';
 _userid
 [e-mail]
+COMMIT;
 drop table t1;
 set autocommit=1;
 CREATE TABLE t1 (
@@ -829,6 +831,7 @@
 set autocommit=0;
 create table t1 (a int not null) engine= innodb;
 insert into t1 values(1),(2);
+commit;
 truncate table t1;
 commit;
 truncate table t1;
@@ -2536,6 +2539,7 @@
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 insert into t1 select * from t2;
 update t1 set b = (select e from t2 where a = d);
+commit;
 create table t3(d int not null, e int, primary key(d)) engine=innodb
 select * from t2;
 commit;
@@ -2640,6 +2644,7 @@
 CREATE TABLE t1 ( a int ) ENGINE=innodb;
 BEGIN;
 INSERT INTO t1 VALUES (1);
+COMMIT;
 ALTER TABLE t1 ENGINE=innodb;
 DROP TABLE t1;
 CREATE TABLE t1 (id int PRIMARY KEY, f int NOT NULL, INDEX(f)) ENGINE=InnoDB;

=== modified file 'plugin/innobase/tests/r/innodb_bug51920.result'
--- plugin/innobase/tests/r/innodb_bug51920.result	2010-10-15 06:47:31 +0000
+++ plugin/innobase/tests/r/innodb_bug51920.result	2011-01-06 13:49:38 +0000
@@ -8,4 +8,5 @@
 SET @thread_id= ID;
 KILL @thread_id;
 Got one of the listed errors
+COMMIT;
 DROP TABLE bug51920;

=== modified file 'plugin/innobase/tests/r/innodb_bug53674.result'
--- plugin/innobase/tests/r/innodb_bug53674.result	2010-11-10 00:53:46 +0000
+++ plugin/innobase/tests/r/innodb_bug53674.result	2011-01-06 13:49:38 +0000
@@ -8,4 +8,5 @@
 select * from bug53674 where a=(select a from bug53674 where a > 1);
 a
 2
+commit;
 drop table bug53674;

=== modified file 'plugin/innobase/tests/r/innodb_mysql.result'
--- plugin/innobase/tests/r/innodb_mysql.result	2010-12-08 22:35:56 +0000
+++ plugin/innobase/tests/r/innodb_mysql.result	2011-01-06 13:49:38 +0000
@@ -590,6 +590,7 @@
 CREATE TABLE t2 (a int, b int, primary key (a));
 BEGIN;
 INSERT INTO t2 values(100,100);
+COMMIT;
 CREATE TABLE IF NOT EXISTS t2 (primary key (a)) select * from t1;
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 SELECT * from t2;

=== modified file 'plugin/innobase/tests/r/unsafe_binlog_innodb.result'
--- plugin/innobase/tests/r/unsafe_binlog_innodb.result	2010-09-12 14:34:27 +0000
+++ plugin/innobase/tests/r/unsafe_binlog_innodb.result	2011-01-06 13:49:38 +0000
@@ -58,6 +58,7 @@
 set autocommit = 0;
 insert into t1 select * from t2;
 update t1 set b = (select e from t2 where a = d);
+COMMIT;
 create table t3(d int not null, e int, primary key(d)) engine = InnoDB
 select * from t2;
 commit;

=== modified file 'plugin/innobase/tests/t/innodb-semi-consistent.test'
--- plugin/innobase/tests/t/innodb-semi-consistent.test	2010-09-12 14:34:27 +0000
+++ plugin/innobase/tests/t/innodb-semi-consistent.test	2011-01-06 13:49:38 +0000
@@ -42,6 +42,7 @@
 commit;
 connection a;
 select * from t1;
+commit;
 drop table t1;
 connection default;
 disconnect a;

=== modified file 'plugin/innobase/tests/t/innodb.test'
--- plugin/innobase/tests/t/innodb.test	2010-12-07 09:12:12 +0000
+++ plugin/innobase/tests/t/innodb.test	2011-01-06 13:49:38 +0000
@@ -228,6 +228,7 @@
 delete from t1;
 commit;
 select * from t1;
+commit;
 drop table t1;
 
 #
@@ -235,9 +236,9 @@
 #
 
 create table t1 (a integer) engine=innodb;
-start transaction;
 rename table t1 to t2;
 create table t1 (b integer) engine=innodb;
+start transaction;
 insert into t1 values (1);
 rollback;
 drop table t1;
@@ -260,6 +261,7 @@
 COMMIT;
 SELECT * FROM t1;
 SELECT _userid FROM t1 WHERE _userid='[e-mail]';
+COMMIT;
 drop table t1;
 set autocommit=1;
 
@@ -549,6 +551,7 @@
 set autocommit=0;
 create table t1 (a int not null) engine= innodb;
 insert into t1 values(1),(2);
+commit;
 truncate table t1;
 commit;
 truncate table t1;
@@ -1616,6 +1619,7 @@
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 insert into t1 select * from t2;
 update t1 set b = (select e from t2 where a = d);
+commit;
 create table t3(d int not null, e int, primary key(d)) engine=innodb
 select * from t2;
 commit;
@@ -1810,6 +1814,7 @@
 CREATE TABLE t1 ( a int ) ENGINE=innodb;
 BEGIN;
 INSERT INTO t1 VALUES (1);
+COMMIT;
 ALTER TABLE t1 ENGINE=innodb;
 DROP TABLE t1;
 

=== modified file 'plugin/innobase/tests/t/innodb_bug51920.test'
--- plugin/innobase/tests/t/innodb_bug51920.test	2010-10-15 12:10:08 +0000
+++ plugin/innobase/tests/t/innodb_bug51920.test	2011-01-06 13:49:38 +0000
@@ -38,5 +38,6 @@
 -- error ER_QUERY_INTERRUPTED,20,2
 reap;
 connection default;
+COMMIT;
 DROP TABLE bug51920;
 -- disconnect con1

=== modified file 'plugin/innobase/tests/t/innodb_bug53674.test'
--- plugin/innobase/tests/t/innodb_bug53674.test	2010-11-10 00:53:46 +0000
+++ plugin/innobase/tests/t/innodb_bug53674.test	2011-01-06 13:49:38 +0000
@@ -3,4 +3,5 @@
 start transaction;
 select * from bug53674 for update;
 select * from bug53674 where a=(select a from bug53674 where a > 1);
+commit;
 drop table bug53674;

=== modified file 'plugin/myisam/tests/r/mix2_myisam.result'
--- plugin/myisam/tests/r/mix2_myisam.result	2010-12-07 09:12:12 +0000
+++ plugin/myisam/tests/r/mix2_myisam.result	2011-01-06 13:49:38 +0000
@@ -1658,5 +1658,6 @@
 create TEMPORARY table t1 ( a int ) ENGINE=MyISAM;
 BEGIN;
 INSERT INTO t1 VALUES (1);
+COMMIT;
 ALTER TABLE t1 ENGINE=MyISAM;
 DROP TABLE t1;

=== modified file 'plugin/storage_engine_api_tester/tests/r/transaction.result'
--- plugin/storage_engine_api_tester/tests/r/transaction.result	2010-11-29 07:03:38 +0000
+++ plugin/storage_engine_api_tester/tests/r/transaction.result	2011-01-06 13:49:38 +0000
@@ -39,5 +39,6 @@
 FROM t1_trx
 INNER JOIN t1_non_trx ON t1_trx.k = t1_non_trx.k;
 k	v
+COMMIT;
 DROP TABLE t1_trx;
 DROP TABLE t1_non_trx;

=== modified file 'plugin/storage_engine_api_tester/tests/t/transaction.test'
--- plugin/storage_engine_api_tester/tests/t/transaction.test	2010-11-29 07:03:38 +0000
+++ plugin/storage_engine_api_tester/tests/t/transaction.test	2011-01-06 13:49:38 +0000
@@ -52,5 +52,6 @@
 FROM t1_trx
 INNER JOIN t1_non_trx ON t1_trx.k = t1_non_trx.k;
 
+COMMIT;
 DROP TABLE t1_trx;
 DROP TABLE t1_non_trx;

=== modified file 'plugin/transaction_log/tests/r/auto_commit.result'
--- plugin/transaction_log/tests/r/auto_commit.result	2010-12-21 20:47:29 +0000
+++ plugin/transaction_log/tests/r/auto_commit.result	2011-01-06 13:49:38 +0000
@@ -6,6 +6,7 @@
 );
 INSERT INTO t1 VALUES (1, "I love testing.");
 INSERT INTO t1 VALUES (2, "I hate testing.");
+COMMIT;
 DROP TABLE t1;
 SET AUTOCOMMIT= 1;
 CREATE TABLE t1 (

=== modified file 'plugin/transaction_log/tests/r/transaction_log_transaction.result'
--- plugin/transaction_log/tests/r/transaction_log_transaction.result	2010-12-21 20:47:29 +0000
+++ plugin/transaction_log/tests/r/transaction_log_transaction.result	2011-01-06 13:49:38 +0000
@@ -572,6 +572,7 @@
 INSERT INTO t1 (b) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(100),(101);
 INSERT INTO t2 (b) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(100),(101);
 UPDATE t1 SET b = b*10 WHERE b%2=0;
+COMMIT;
 CREATE TABLE t3 LIKE t1;
 Check transaction_log_entries
 SELECT COUNT(*) FROM DATA_DICTIONARY.TRANSACTION_LOG_ENTRIES;

=== modified file 'plugin/transaction_log/tests/t/auto_commit.inc'
--- plugin/transaction_log/tests/t/auto_commit.inc	2009-12-11 21:28:10 +0000
+++ plugin/transaction_log/tests/t/auto_commit.inc	2011-01-06 13:49:38 +0000
@@ -16,6 +16,7 @@
 INSERT INTO t1 VALUES (1, "I love testing.");
 INSERT INTO t1 VALUES (2, "I hate testing.");
 
+COMMIT;
 DROP TABLE t1;
 
 # Try the same thing with auto_commit turned on

=== modified file 'plugin/transaction_log/tests/t/transaction_log_transaction.test'
--- plugin/transaction_log/tests/t/transaction_log_transaction.test	2010-10-28 21:31:13 +0000
+++ plugin/transaction_log/tests/t/transaction_log_transaction.test	2011-01-06 13:49:38 +0000
@@ -77,7 +77,7 @@
 INSERT INTO t1 (b) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(100),(101);
 INSERT INTO t2 (b) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),(100),(101);
 UPDATE t1 SET b = b*10 WHERE b%2=0;
-# this will cause implicit COMMIT
+COMMIT;
 CREATE TABLE t3 LIKE t1;
 
 --source ../plugin/transaction_log/tests/t/check_transaction_log.inc

=== modified file 'plugin/utility_functions/tests/r/execute_wait.result'
--- plugin/utility_functions/tests/r/execute_wait.result	2010-12-09 06:44:30 +0000
+++ plugin/utility_functions/tests/r/execute_wait.result	2011-01-06 13:49:38 +0000
@@ -13,14 +13,30 @@
 1	1
 SELECT TABLE_NAME FROM DATA_DICTIONARY.TABLES WHERE TABLE_SCHEMA=SCHEMA() ORDER BY TABLE_NAME;
 TABLE_NAME
-A
-B
-C
 t1
 SELECT IF((COUNT(TABLE_NAME) = 3), "YES", "NO") FROM DATA_DICTIONARY.TABLES WHERE TABLE_NAME IN ("A", "B", "C") AND TABLE_SCHEMA=SCHEMA();
 IF((COUNT(TABLE_NAME) = 3), "YES", "NO")
+NO
+DROP TABLE t1;
+CREATE TABLE t1 (A VARCHAR(150));
+SET @execute= "SELECT WAIT('barrier')";
+INSERT INTO t1 VALUES ("COMMIT; CREATE TABLE A (A INT)"), ("COMMIT; CREATE TABLE B (A INT)"), ("CREATE TABLE C (A INT)");
+SELECT A FROM t1 ORDER BY A;
+A
+COMMIT; CREATE TABLE A (A INT)
+COMMIT; CREATE TABLE B (A INT)
+CREATE TABLE C (A INT)
+SELECT EXECUTE(A) WAIT, 1 FROM t1;
+EXECUTE(A) WAIT	1
+1	1
+1	1
+1	1
+SELECT TABLE_NAME FROM DATA_DICTIONARY.TABLES WHERE TABLE_SCHEMA=SCHEMA() ORDER BY TABLE_NAME;
+TABLE_NAME
+A
+B
+t1
+SELECT IF((COUNT(TABLE_NAME) = 2), "YES", "NO") FROM DATA_DICTIONARY.TABLES WHERE TABLE_NAME IN ("A", "B", "C") AND TABLE_SCHEMA=SCHEMA();
+IF((COUNT(TABLE_NAME) = 2), "YES", "NO")
 YES
-DROP TABLE A;
-DROP TABLE B;
-DROP TABLE C;
-DROP TABLE t1;
+DROP TABLE A, B, t1;

=== modified file 'plugin/utility_functions/tests/t/execute_wait.test'
--- plugin/utility_functions/tests/t/execute_wait.test	2010-12-09 06:44:30 +0000
+++ plugin/utility_functions/tests/t/execute_wait.test	2011-01-06 13:49:38 +0000
@@ -6,7 +6,14 @@
 SELECT EXECUTE(A) WAIT, 1 FROM t1;
 SELECT TABLE_NAME FROM DATA_DICTIONARY.TABLES WHERE TABLE_SCHEMA=SCHEMA() ORDER BY TABLE_NAME;
 SELECT IF((COUNT(TABLE_NAME) = 3), "YES", "NO") FROM DATA_DICTIONARY.TABLES WHERE TABLE_NAME IN ("A", "B", "C") AND TABLE_SCHEMA=SCHEMA();
-DROP TABLE A;
-DROP TABLE B;
-DROP TABLE C;
 DROP TABLE t1;
+
+CREATE TABLE t1 (A VARCHAR(150));
+SET @execute= "SELECT WAIT('barrier')";
+INSERT INTO t1 VALUES ("COMMIT; CREATE TABLE A (A INT)"), ("COMMIT; CREATE TABLE B (A INT)"), ("CREATE TABLE C (A INT)");
+SELECT A FROM t1 ORDER BY A;
+SELECT EXECUTE(A) WAIT, 1 FROM t1;
+SELECT TABLE_NAME FROM DATA_DICTIONARY.TABLES WHERE TABLE_SCHEMA=SCHEMA() ORDER BY TABLE_NAME;
+SELECT IF((COUNT(TABLE_NAME) = 2), "YES", "NO") FROM DATA_DICTIONARY.TABLES WHERE TABLE_NAME IN ("A", "B", "C") AND TABLE_SCHEMA=SCHEMA();
+DROP TABLE A, B, t1;
+

=== modified file 'tests/include.am'
--- tests/include.am	2011-01-05 04:45:57 +0000
+++ tests/include.am	2011-01-06 13:49:38 +0000
@@ -23,7 +23,7 @@
 GENSCRIPTS =		tests/dtr tests/mtr tests/test-run
 PRESCRIPTS =		tests/test-run.pl tests/stress-test.pl
 PLUGIN_TESTS =		$(pandora_plugin_test_list)
-NORMAL_TESTS =		main,bool_type,cast,flush_tables,identifiers,jp,mysql_compatibility,regression,tamil,time_type,unsigned_integer_type,uuid_type,$(PLUGIN_TESTS)
+NORMAL_TESTS =		main,bool_type,cast,ddl_transactions,flush_tables,identifiers,jp,mysql_compatibility,regression,tamil,time_type,unsigned_integer_type,uuid_type,$(PLUGIN_TESTS)
 ALL_TESTS =		main,big,jp,tamil,regression,$(PLUGIN_TESTS)
 noinst_SCRIPTS =	$(GENSCRIPTS) $(PRESCRIPTS)
 CLEANFILES += 		$(GENSCRIPTS) tests/mtr

=== modified file 'tests/include/mix1.inc'
--- tests/include/mix1.inc	2010-12-07 18:12:07 +0000
+++ tests/include/mix1.inc	2011-01-06 13:49:38 +0000
@@ -653,6 +653,7 @@
 CREATE TABLE t2 (a int, b int, primary key (a));
 BEGIN;
 INSERT INTO t2 values(100,100);
+COMMIT;
 --error ER_DUP_ENTRY
 CREATE TABLE IF NOT EXISTS t2 (primary key (a)) select * from t1;
 SELECT * from t2;

=== modified file 'tests/include/mix2.inc'
--- tests/include/mix2.inc	2010-12-07 09:12:12 +0000
+++ tests/include/mix2.inc	2011-01-06 13:49:38 +0000
@@ -2162,6 +2162,7 @@
 eval create $temp table t1 ( a int ) ENGINE=$engine_type;
 BEGIN;
 INSERT INTO t1 VALUES (1);
+COMMIT;
 eval ALTER TABLE t1 ENGINE=$engine_type;
 DROP TABLE t1;
 

=== modified file 'tests/include/unsafe_binlog.inc'
--- tests/include/unsafe_binlog.inc	2009-08-03 23:01:21 +0000
+++ tests/include/unsafe_binlog.inc	2011-01-06 13:49:38 +0000
@@ -116,6 +116,7 @@
 set autocommit = 0;
 insert into t1 select * from t2;
 update t1 set b = (select e from t2 where a = d);
+COMMIT;
 eval create table t3(d int not null, e int, primary key(d)) engine = $engine_type
 select * from t2;
 commit;

=== modified file 'tests/r/flush_block_commit.result'
--- tests/r/flush_block_commit.result	2010-08-15 17:21:42 +0000
+++ tests/r/flush_block_commit.result	2011-01-06 13:49:38 +0000
@@ -36,4 +36,5 @@
 show create database test;
 Database	Create Database
 test	CREATE DATABASE `test` COLLATE = utf8_general_ci
+COMMIT;
 drop table t1;

=== modified file 'tests/r/insert.result'
--- tests/r/insert.result	2010-04-20 18:23:07 +0000
+++ tests/r/insert.result	2011-01-06 13:49:38 +0000
@@ -82,6 +82,7 @@
 select count(*) from t2;
 count(*)
 25500
+COMMIT;
 drop table t1,t2,t3;
 create table t1 (a int, b int);
 insert into t1 (a,b) values (a,b);

=== modified file 'tests/r/randgen_queries.result'
--- tests/r/randgen_queries.result	2010-12-20 07:54:13 +0000
+++ tests/r/randgen_queries.result	2011-01-06 13:49:38 +0000
@@ -160,4 +160,5 @@
 select COUNT(*) from data_dictionary.tables;
 COUNT(*)
 ####.##.####
+COMMIT;
 DROP TABLE t1;

=== modified file 'tests/r/savepoints.result'
--- tests/r/savepoints.result	2010-12-21 02:58:40 +0000
+++ tests/r/savepoints.result	2011-01-06 13:49:38 +0000
@@ -5,6 +5,7 @@
 UPDATE t1 SET id = 2 WHERE id != 2 LIMIT 0;
 SAVEPOINT A;
 End Test of Bug 534806
+COMMIT;
 DROP TABLE t1;
 CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY);
 START TRANSACTION;
@@ -45,6 +46,7 @@
 2
 3
 4
+COMMIT;
 DROP TABLE t1;
 Start Test of Bug 542299
 CREATE TABLE t1 (a int,id integer auto_increment,b int,/*Indices*/key (a ),primary key (id)) ENGINE=innodb;
@@ -57,4 +59,5 @@
 INSERT INTO t1 ( a, b ) VALUES ( 1 , 9 );
 ROLLBACK TO SAVEPOINT A;
 End Test of Bug 542299
+COMMIT;
 DROP TABLE t1;

=== modified file 'tests/r/select_in_null.result'
--- tests/r/select_in_null.result	2009-10-19 03:26:17 +0000
+++ tests/r/select_in_null.result	2011-01-06 13:49:38 +0000
@@ -6,7 +6,6 @@
 b int,
 primary key( a )
 ) engine=myisam;
-begin;
 insert into foo( b ) values (1),(1),(1),(1),(1);
 create table t2 as select * from foo;
 insert into foo( b ) select b from t2;
@@ -23,7 +22,6 @@
 create table t2 as select * from foo;
 insert into foo( b ) select b from t2;
 drop table t2;
-commit;
 explain select * from foo where a in (160000, 160001, 160002);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	foo	range	PRIMARY	PRIMARY	4	NULL	3	Using where

=== modified file 'tests/r/statement_boundaries.result'
--- tests/r/statement_boundaries.result	2010-10-14 18:58:48 +0000
+++ tests/r/statement_boundaries.result	2011-01-06 13:49:38 +0000
@@ -6,6 +6,7 @@
 SHOW STATUS LIKE 'Handler_commit%';
 Variable_name	Value
 Handler_commit	0
+COMMIT;
 DROP SCHEMA IF EXISTS boundaries;
 Warnings:
 Note	1008	Can't drop schema 'boundaries'; schema doesn't exist
@@ -20,10 +21,10 @@
 SHOW STATUS LIKE 'Handler_commit%';
 Variable_name	Value
 Handler_commit	1
-BEGIN;
 DROP SCHEMA IF EXISTS boundaries;
 Warnings:
 Note	1008	Can't drop schema 'boundaries'; schema doesn't exist
+BEGIN;
 COMMIT;
 SHOW STATUS LIKE 'Handler_commit%';
 Variable_name	Value
@@ -77,6 +78,7 @@
 SHOW STATUS LIKE 'Handler_commit%';
 Variable_name	Value
 Handler_commit	4
+COMMIT;
 drop table commit_test;
 SHOW STATUS LIKE 'Handler_commit%';
 Variable_name	Value

=== modified file 'tests/r/transaction.result'
--- tests/r/transaction.result	2010-02-25 04:27:11 +0000
+++ tests/r/transaction.result	2011-01-06 13:49:38 +0000
@@ -39,5 +39,6 @@
 FROM t1_trx
 INNER JOIN t1_non_trx ON t1_trx.k = t1_non_trx.k;
 k	v
+COMMIT;
 DROP TABLE t1_trx;
 DROP TABLE t1_non_trx;

=== modified file 'tests/r/trx_isolation_read_committed.result'
--- tests/r/trx_isolation_read_committed.result	2010-10-25 04:18:50 +0000
+++ tests/r/trx_isolation_read_committed.result	2011-01-06 13:49:38 +0000
@@ -30,4 +30,5 @@
 a
 1
 2
+COMMIT;
 DROP TABLE t1;

=== added directory 'tests/suite/ddl_transactions'
=== removed directory 'tests/suite/ddl_transactions'
=== added directory 'tests/suite/ddl_transactions/r'
=== added file 'tests/suite/ddl_transactions/r/alter_schema.result'
--- tests/suite/ddl_transactions/r/alter_schema.result	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/r/alter_schema.result	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE SCHEMA foo;
+begin;
+alter schema foo collate = utf8_bin;
+ERROR HY000: Transactional DDL not supported
+commit;
+DROP SCHEMA foo;

=== added file 'tests/suite/ddl_transactions/r/alter_table.result'
--- tests/suite/ddl_transactions/r/alter_table.result	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/r/alter_table.result	2011-01-06 13:49:38 +0000
@@ -0,0 +1,8 @@
+CREATE TABLE t1 (a int);
+BEGIN;
+ALTER TABLE t1 ADD COLUMN b int;
+ERROR HY000: Transactional DDL not supported
+ALTER TABLE t1 DISCARD TABLESPACE;
+ERROR HY000: Transactional DDL not supported
+COMMIT;
+DROP TABLE t1;

=== added file 'tests/suite/ddl_transactions/r/create_index.result'
--- tests/suite/ddl_transactions/r/create_index.result	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/r/create_index.result	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE TABLE t1 (a int);
+BEGIN;
+CREATE INDEX foo on t1 (a);
+ERROR HY000: Transactional DDL not supported
+COMMIT;
+DROP TABLE t1;

=== added file 'tests/suite/ddl_transactions/r/create_schema.result'
--- tests/suite/ddl_transactions/r/create_schema.result	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/r/create_schema.result	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE SCHEMA foo;
+DROP SCHEMA foo;
+BEGIN;
+CREATE SCHEMA foo;
+ERROR HY000: Transactional DDL not supported
+COMMIT;

=== added file 'tests/suite/ddl_transactions/r/create_table.result'
--- tests/suite/ddl_transactions/r/create_table.result	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/r/create_table.result	2011-01-06 13:49:38 +0000
@@ -0,0 +1,4 @@
+BEGIN;
+CREATE TABLE t1 (a int);
+ERROR HY000: Transactional DDL not supported
+COMMIT;

=== added file 'tests/suite/ddl_transactions/r/drop_index.result'
--- tests/suite/ddl_transactions/r/drop_index.result	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/r/drop_index.result	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE TABLE t1 (a int, index a_idx (a));
+BEGIN;
+DROP INDEX a_idx on t1;
+ERROR HY000: Transactional DDL not supported
+commit;
+drop table t1;

=== added file 'tests/suite/ddl_transactions/r/drop_schema.result'
--- tests/suite/ddl_transactions/r/drop_schema.result	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/r/drop_schema.result	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE SCHEMA foo;
+BEGIN;
+DROP SCHEMA foo;
+ERROR HY000: Transactional DDL not supported
+commit;
+DROP SCHEMA foo;

=== added file 'tests/suite/ddl_transactions/r/drop_table.result'
--- tests/suite/ddl_transactions/r/drop_table.result	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/r/drop_table.result	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE TABLE t1 (a int);
+BEGIN;
+DROP TABLE t1;
+ERROR HY000: Transactional DDL not supported
+COMMIT;
+DROP TABLE t1;

=== added file 'tests/suite/ddl_transactions/r/rename_table.result'
--- tests/suite/ddl_transactions/r/rename_table.result	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/r/rename_table.result	2011-01-06 13:49:38 +0000
@@ -0,0 +1,8 @@
+CREATE TABLE t1 (a int);
+begin;
+RENAME TABLE t1 to t2;
+ERROR HY000: Transactional DDL not supported
+commit;
+DROP TABLE IF EXISTS t1,t2;
+Warnings:
+Note	1051	Unknown table 't2'

=== added file 'tests/suite/ddl_transactions/r/truncate_table.result'
--- tests/suite/ddl_transactions/r/truncate_table.result	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/r/truncate_table.result	2011-01-06 13:49:38 +0000
@@ -0,0 +1,7 @@
+CREATE TABLE t1 (a int);
+insert into t1 values (1),(2),(42);
+BEGIN;
+TRUNCATE TABLE t1;
+ERROR HY000: Transactional DDL not supported
+COMMIT;
+DROP TABLE t1;

=== added directory 'tests/suite/ddl_transactions/t'
=== added file 'tests/suite/ddl_transactions/t/alter_schema.test'
--- tests/suite/ddl_transactions/t/alter_schema.test	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/t/alter_schema.test	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE SCHEMA foo;
+begin;
+--error 1727
+alter schema foo collate = utf8_bin;
+commit;
+DROP SCHEMA foo;

=== added file 'tests/suite/ddl_transactions/t/alter_table.test'
--- tests/suite/ddl_transactions/t/alter_table.test	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/t/alter_table.test	2011-01-06 13:49:38 +0000
@@ -0,0 +1,8 @@
+CREATE TABLE t1 (a int);
+BEGIN;
+--error 1727
+ALTER TABLE t1 ADD COLUMN b int;
+--error 1727
+ALTER TABLE t1 DISCARD TABLESPACE;
+COMMIT;
+DROP TABLE t1;

=== added file 'tests/suite/ddl_transactions/t/create_index.test'
--- tests/suite/ddl_transactions/t/create_index.test	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/t/create_index.test	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE TABLE t1 (a int);
+BEGIN;
+--error 1727
+CREATE INDEX foo on t1 (a);
+COMMIT;
+DROP TABLE t1;

=== added file 'tests/suite/ddl_transactions/t/create_schema.test'
--- tests/suite/ddl_transactions/t/create_schema.test	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/t/create_schema.test	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE SCHEMA foo;
+DROP SCHEMA foo;
+BEGIN;
+--error 1727
+CREATE SCHEMA foo;
+COMMIT;

=== added file 'tests/suite/ddl_transactions/t/create_table.test'
--- tests/suite/ddl_transactions/t/create_table.test	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/t/create_table.test	2011-01-06 13:49:38 +0000
@@ -0,0 +1,4 @@
+BEGIN;
+--error 1727
+CREATE TABLE t1 (a int);
+COMMIT;

=== added file 'tests/suite/ddl_transactions/t/drop_index.test'
--- tests/suite/ddl_transactions/t/drop_index.test	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/t/drop_index.test	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE TABLE t1 (a int, index a_idx (a));
+BEGIN;
+--error 1727
+DROP INDEX a_idx on t1;
+commit;
+drop table t1;

=== added file 'tests/suite/ddl_transactions/t/drop_schema.test'
--- tests/suite/ddl_transactions/t/drop_schema.test	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/t/drop_schema.test	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE SCHEMA foo;
+BEGIN;
+--error 1727
+DROP SCHEMA foo;
+commit;
+DROP SCHEMA foo;

=== added file 'tests/suite/ddl_transactions/t/drop_table.test'
--- tests/suite/ddl_transactions/t/drop_table.test	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/t/drop_table.test	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE TABLE t1 (a int);
+BEGIN;
+--error 1727
+DROP TABLE t1;
+COMMIT;
+DROP TABLE t1;

=== added file 'tests/suite/ddl_transactions/t/rename_table.test'
--- tests/suite/ddl_transactions/t/rename_table.test	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/t/rename_table.test	2011-01-06 13:49:38 +0000
@@ -0,0 +1,6 @@
+CREATE TABLE t1 (a int);
+begin;
+--error 1727
+RENAME TABLE t1 to t2;
+commit;
+DROP TABLE IF EXISTS t1,t2;

=== added file 'tests/suite/ddl_transactions/t/truncate_table.test'
--- tests/suite/ddl_transactions/t/truncate_table.test	1970-01-01 00:00:00 +0000
+++ tests/suite/ddl_transactions/t/truncate_table.test	2011-01-06 13:49:38 +0000
@@ -0,0 +1,7 @@
+CREATE TABLE t1 (a int);
+insert into t1 values (1),(2),(42);
+BEGIN;
+--error 1727
+TRUNCATE TABLE t1;
+COMMIT;
+DROP TABLE t1;

=== modified file 'tests/t/flush_block_commit.test'
--- tests/t/flush_block_commit.test	2010-11-11 12:52:12 +0000
+++ tests/t/flush_block_commit.test	2011-01-06 13:49:38 +0000
@@ -71,7 +71,7 @@
 begin;
 select * from t1;
 show create database test;
-
+COMMIT;
 drop table t1;
 
 # End of 4.1 tests

=== modified file 'tests/t/insert.test'
--- tests/t/insert.test	2010-08-26 21:56:15 +0000
+++ tests/t/insert.test	2011-01-06 13:49:38 +0000
@@ -94,7 +94,6 @@
 create table t2(id2 int not null, t char(12));
 create table t3(id3 int not null, t char(12), index(id3));
 disable_query_log;
-set autocommit=0;
 begin;
 let $1 = 100;
 while ($1)
@@ -120,6 +119,7 @@
 insert into  t2 select t1.* from t1, t2 t, t3 where  t1.id1 = t.id2 and t.id2 = t3.id3;
 insert into  t2 select SQL_BIG_RESULT t1.* from t1, t2 t, t3 where  t1.id1 = t.id2 and t.id2 = t3.id3;
 select count(*) from t2;
+COMMIT;
 drop table t1,t2,t3;
 
 #

=== modified file 'tests/t/randgen_queries.test'
--- tests/t/randgen_queries.test	2010-07-21 19:15:45 +0000
+++ tests/t/randgen_queries.test	2011-01-06 13:49:38 +0000
@@ -96,5 +96,5 @@
 --replace_column 1 ####.##.####
 --sorted_result
 select COUNT(*) from data_dictionary.tables;
-
+COMMIT;
 DROP TABLE t1;

=== modified file 'tests/t/savepoints.test'
--- tests/t/savepoints.test	2010-12-21 02:58:40 +0000
+++ tests/t/savepoints.test	2011-01-06 13:49:38 +0000
@@ -12,7 +12,7 @@
 SAVEPOINT A;
 
 --echo End Test of Bug 534806
-
+COMMIT;
 DROP TABLE t1;
 
 # Let's test the non-edge case for SAVEPOINTS:
@@ -62,6 +62,7 @@
 
 # t1 should have 1,2,3,4 in it.
 SELECT * FROM t1;
+COMMIT;
 DROP TABLE t1;
 
 # 
@@ -81,4 +82,5 @@
 ROLLBACK TO SAVEPOINT A;
 
 --echo End Test of Bug 542299
+COMMIT;
 DROP TABLE t1;

=== modified file 'tests/t/select_in_null.test'
--- tests/t/select_in_null.test	2009-10-19 03:26:17 +0000
+++ tests/t/select_in_null.test	2011-01-06 13:49:38 +0000
@@ -12,7 +12,6 @@
 	primary key( a )
 ) engine=myisam;
 
-begin;
 insert into foo( b ) values (1),(1),(1),(1),(1);
 create table t2 as select * from foo;
 insert into foo( b ) select b from t2;
@@ -29,7 +28,6 @@
 create table t2 as select * from foo;
 insert into foo( b ) select b from t2;
 drop table t2;
-commit;
 
 explain select * from foo where a in (160000, 160001, 160002);
 explain select * from foo where a in (null, 160000, 160001, 160002);

=== modified file 'tests/t/statement_boundaries.test'
--- tests/t/statement_boundaries.test	2010-03-14 20:36:41 +0000
+++ tests/t/statement_boundaries.test	2011-01-06 13:49:38 +0000
@@ -16,10 +16,10 @@
 
 SHOW STATUS LIKE 'Handler_commit%';
 
+COMMIT;
 DROP SCHEMA IF EXISTS boundaries;
 
-# Expect 1 commit count since above DROP SCHEMA
-# will implicitly call COMMIT.
+# Expect 1 commit count since above COMMIT before DROP SCHEMA
 #
 # When we get transactional DDL, should be 0.
 SHOW STATUS LIKE 'Handler_commit%';
@@ -38,8 +38,8 @@
 SET AUTOCOMMIT= 1;
 
 SHOW STATUS LIKE 'Handler_commit%';
+DROP SCHEMA IF EXISTS boundaries;
 BEGIN;
-DROP SCHEMA IF EXISTS boundaries;
 COMMIT;
 
 SHOW STATUS LIKE 'Handler_commit%';
@@ -83,5 +83,6 @@
 
 
 SHOW STATUS LIKE 'Handler_commit%';
+COMMIT;
 drop table commit_test;
 SHOW STATUS LIKE 'Handler_commit%';

=== modified file 'tests/t/transaction.test'
--- tests/t/transaction.test	2010-02-25 04:27:11 +0000
+++ tests/t/transaction.test	2011-01-06 13:49:38 +0000
@@ -52,5 +52,6 @@
 FROM t1_trx
 INNER JOIN t1_non_trx ON t1_trx.k = t1_non_trx.k;
 
+COMMIT;
 DROP TABLE t1_trx;
 DROP TABLE t1_non_trx;

=== modified file 'tests/t/trx_isolation_read_committed.test'
--- tests/t/trx_isolation_read_committed.test	2010-10-25 04:18:50 +0000
+++ tests/t/trx_isolation_read_committed.test	2011-01-06 13:49:38 +0000
@@ -36,6 +36,7 @@
 BEGIN;
 SELECT * from t1 order by a;
 
+COMMIT;
 DROP TABLE t1;
 
 disconnect a;

=== modified file 'tests/test-run.pl'
--- tests/test-run.pl	2011-01-05 04:45:57 +0000
+++ tests/test-run.pl	2011-01-06 13:49:38 +0000
@@ -148,7 +148,7 @@
 
 our $opt_usage;
 our $opt_suites;
-our $opt_suites_default= "main,bool_type,cast,flush_tables,identifiers,jp,mysql_compatibility,regression,tamil,time_type,unsigned_integer_type,uuid_type"; # Default suites to run
+our $opt_suites_default= "main,bool_type,cast,ddl_transactions,flush_tables,identifiers,jp,mysql_compatibility,regression,tamil,time_type,unsigned_integer_type,uuid_type"; # Default suites to run
 our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
 our $opt_verbose= 0;  # Verbose output, enable with --verbose