Merge lp:~jaypipes/drizzle/bug552420 into lp:~drizzle-trunk/drizzle/development

[Jay Pipes]

Fixes Bug #552420 by manually calling plugin::StorageEngine::startStatement() during ALTER TABLE. Since the copied-to table in ALTER TABLE is temporary, mysql_lock_tables() is never called, meaning the automatic call to plugin::StorageEngine::startStatement() is also not called, and that meant transactional storage engines weren't notified of a new transaction.

[Brian Aker (brianaker)]

This will need Monty's fix for one/other Innodb.

review: Needs Information

[Stewart Smith (stewart)]

I gather that commitTransaction is called okay later. the assert about transaction != NULL in embedded_innodb is actually superfluous because of quite liberal asserts in libinnodb, but i'm okay with it being there :)

looks good!

review: Approve

[Brian Aker (brianaker)]

Stewart, did you get a chance to merge this into your tree?

[Stewart Smith (stewart)]

On Thu, 27 May 2010 04:27:26 -0000, Brian Aker <email address hidden> wrote:
> Stewart, did you get a chance to merge this into your tree?

on TODO for tomorrow morning.
--
Stewart Smith

[Stewart Smith (stewart)]

https://code.edge.launchpad.net/~stewart-flamingspork/drizzle/embedded-innodb-bug552420-merge/+merge/26270

Now has latest embedded_innodb and this merged.

=== modified file 'drizzled/statement/alter_table.cc'
--- drizzled/statement/alter_table.cc	2010-04-20 18:14:52 +0000
+++ drizzled/statement/alter_table.cc	2010-04-30 17:32:30 +0000
@@ -1344,6 +1344,15 @@
   */
   TransactionServices &transaction_services= TransactionServices::singleton();
 
+  /* 
+   * LP Bug #552420 
+   *
+   * Since open_temporary_table() doesn't invoke mysql_lock_tables(), we
+   * don't get the usual automatic call to StorageEngine::startStatement(), so
+   * we manually call it here...
+   */
+  to->s->getEngine()->startStatement(session);
+
   if (!(copy= new CopyField[to->s->fields]))
     return -1;
 

=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
--- plugin/embedded_innodb/embedded_innodb_engine.cc	2010-04-30 17:32:29 +0000
+++ plugin/embedded_innodb/embedded_innodb_engine.cc	2010-04-30 17:32:30 +0000
@@ -1639,14 +1639,10 @@
 {
   ib_trx_t transaction;
 
-  if(*get_trx(current_session) == NULL)
-  {
-    EmbeddedInnoDBEngine *innodb_engine= static_cast<EmbeddedInnoDBEngine*>(engine);
-    innodb_engine->doStartTransaction(current_session, START_TRANS_NO_OPTIONS);
-  }
-
   transaction= *get_trx(ha_session());
 
+  assert(transaction != NULL);
+
   ib_cursor_attach_trx(cursor, transaction);
 
   tuple= ib_clust_read_tuple_create(cursor);