bzr push into mysql-5.4 branch (guilhem:2873 to 2874) Bug#46657

[Guilhem Bichot]

 2874 Guilhem Bichot	2009-08-25
      Applying fix from Oracle (Marko) for Bug #46657 "InnoDB plugin: invalid read in index_merge_innodb test (Valgrind)"

    modified:
      storage/innobase/handler/handler0alter.cc
 2873 Alexander Nozdrin	2009-08-24
      Backporting patch for Bug#46650 (Innodb assertion autoinc_lock == lock
      in lock_table_remove_low on INSERT SELECT) to mysql-trunk.

    modified:
      storage/innobase/lock/lock0lock.c
=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	2009-07-30 12:42:56 +0000
+++ b/storage/innobase/handler/handler0alter.cc	2009-08-25 15:12:44 +0000
@@ -863,6 +863,7 @@ error_handling:
 		indexed_table->n_mysql_handles_opened++;
 
 		error = row_merge_drop_table(trx, innodb_table);
+		innodb_table = indexed_table;
 		goto convert_error;
 
 	case DB_TOO_BIG_RECORD:


Attachment: [text/bzr-bundle] bzr/[e-mail]