branches/zip: Fix the merge of branches/fast-index-creation -r1413 in r1414.

innodb.test: The error code 1540 has been renumbered to 1542.
innodb.result: Adjust the expected value of Innodb_buffer_pool_pages_total.
Something may have changed in the BLOB handling in branches/zip.

ha_innodb.cc: Add ha_innobase:: prefix to some DBUG_ENTER macros.

row_merge_create_temporary_table(): Free the heap only after invoking
row_create_table_for_mysql().  The table->col_names points to the heap
until the system columns are added by row_create_table_for_mysql().

TODO: use the filename-safe encoding in temporary table names.  Test
extensively under Valgrind and fix all errors found.  Eliminate
merge_rec_t and rewrite row0merge.c to write the records directly to
the merge blocks.

handler/ha_innodb.cc

@@ -8151,7 +8151,7 @@ ha_innobase::add_index(
 	ibool		new_unique  = FALSE;
 	ulint		error = DB_SUCCESS;/* DB_SUCCESS or error code */
 
-	DBUG_ENTER("add_index");
+	DBUG_ENTER("ha_innobase::add_index");
 	ut_a(table && key_info && num_of_keys);
 
 	index = NULL;
@@ -8424,7 +8424,7 @@ ha_innobase::prepare_drop_index(
 	THD*		thd;
 	ulint		error = DB_SUCCESS;
 
-	DBUG_ENTER("prepare_drop_index");
+	DBUG_ENTER("ha_innobase::prepare_drop_index");
 	ut_ad(table && key_num && num_of_keys);
 
 	thd = current_thd;
@@ -8604,7 +8604,7 @@ ha_innobase::final_drop_index(
 	trx_t*		trx;		/* Transaction */
 	ulint		error = DB_SUCCESS;/* DB_SUCCESS or error code */
 
-	DBUG_ENTER("final_drop_index");
+	DBUG_ENTER("ha_innobase::final_drop_index");
 	ut_ad(table);
 
 	/* Create a new transaction for final index drop if it does not

mysql-test/innodb.result

@@ -1769,7 +1769,7 @@ count(*)
 drop table t1;
 show status like "Innodb_buffer_pool_pages_total";
 Variable_name	Value
-Innodb_buffer_pool_pages_total	512
+Innodb_buffer_pool_pages_total	511
 show status like "Innodb_page_size";
 Variable_name	Value
 Innodb_page_size	16384

mysql-test/innodb.test

@@ -1095,7 +1095,7 @@ show create table t2;
 create index id2 on t2 (id);
 show create table t2;
 drop index id2 on t2;
---error 1540,1540
+--error 1542,1542
 drop index id on t2;
 show create table t2;
 drop table t2;

row/row0merge.c

@@ -1989,8 +1989,8 @@ row_merge_create_temporary_table(
 				col->mtype, col->prtype, col->len);
 		}
 
-		mem_heap_free(heap);
 		*error = row_create_table_for_mysql(new_table, trx);
+		mem_heap_free(heap);
 	}
 
 	return(new_table);