branches/zip: row_merge_drop_table(): Replace the

row_drop_table_for_mysql() call with a call to
row_drop_table_for_mysql_no_commit().  The last parameter of
the function is ibool drop_db, not ibool do_commit.  Also,
since r1790 of trunk it is not necessary to copy table->name.

row/row0merge.c

@@ -1941,14 +1941,8 @@ row_merge_drop_table(
 
 	/* Drop the table immediately if it is not referenced by MySQL */
 	if (table->n_mysql_handles_opened == 0) {
-		/* Copy table->name, because table will have been
-		freed when row_drop_table_for_mysql_no_commit()
-		checks with dict_load_table() that the table was
-		indeed dropped. */
-		char* table_name = mem_strdup(table->name);
-		/* Set the commit flag to FALSE. */
-		err = row_drop_table_for_mysql(table_name, trx, FALSE);
-		mem_free(table_name);
+		err = row_drop_table_for_mysql_no_commit(table->name, trx,
+							 FALSE);
 	}
 
 	if (dict_locked) {