bzr push into mysql-trunk branch (marko.makela:4733 to 4734)

[marko.makela]

 4734 Marko Mäkelä	2012-10-17 [merge]
      Merge mysql-5.6 to mysql-trunk.

    modified:
      storage/innobase/dict/dict0dict.cc
 4733 Amit Bhattacharya	2012-10-17 [merge]
      Added test for multi-table UPDATE and DELETE

    added:
      mysql-test/include/multi_table_del_sj.inc
      mysql-test/include/multi_table_upd_sj.inc
      mysql-test/r/multi_table_upd_del_sj.result
      mysql-test/t/multi_table_upd_del_sj.test
=== modified file 'storage/innobase/dict/dict0dict.cc'
--- a/storage/innobase/dict/dict0dict.cc	revid:amit.bhattacharya@stripped7051813-1dz8hor1943kq64s
+++ b/storage/innobase/dict/dict0dict.cc	revid:marko.makela@strippedm9l3n71n91s5w
@@ -5493,10 +5493,10 @@ fail:
 	mtr_commit(&mtr);
 	mem_heap_empty(heap);
 	table_name = static_cast<char*>(mem_heap_alloc(heap, FN_REFLEN + 1));
-	innobase_convert_name(
+	*innobase_convert_name(
 		table_name, FN_REFLEN,
 		index->table_name, strlen(index->table_name),
-		NULL, TRUE);
+		NULL, TRUE) = 0;
 
 	ib_logf(IB_LOG_LEVEL_ERROR, "%s corruption of %s in table %s in %s",
 		status, index->name, table_name, ctx);

No bundle (reason: useless for push emails).