bzr push into mysql-trunk branch (kevin.lewis:3707 to 3708)

[kevin.lewis]

 3708 kevin.lewis@stripped	2012-03-01
      local commmit, fix leftover ISL after reboot

    modified:
      storage/innobase/row/row0mysql.cc
 3707 kevin.lewis@stripped	2012-02-29
      Update with Jimmy's latest review comments.  
      Changed the patch so that the location of the remote IBD tablespace is under an extra folder named after the database, just like the directory structure under the normal --datadir location.

    modified:
      include/my_base.h
      mysql-test/r/mysqlshow.result
      mysql-test/suite/innodb/r/innodb-restart.result
      mysql-test/suite/innodb/r/innodb-system-table-view.result
      mysql-test/suite/innodb/r/innodb_16k.result
      mysql-test/suite/innodb/r/innodb_4k.result
      mysql-test/suite/innodb/r/innodb_8k.result
      mysql-test/suite/innodb/r/innodb_bug60049.result
      mysql-test/suite/innodb/t/innodb-restart.test
      mysql-test/suite/innodb/t/innodb-system-table-view.test
      mysql-test/suite/innodb/t/innodb_16k.test
      mysql-test/suite/innodb/t/innodb_4k.test
      mysql-test/suite/innodb/t/innodb_8k.test
      mysys/my_handler_errors.h
      sql/handler.cc
      sql/share/errmsg-utf8.txt
      storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/i_s.h
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0boot.h
      storage/innobase/include/dict0crea.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/os0file.h
      storage/innobase/include/row0merge.h
      storage/innobase/os/os0file.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/ut/ut0ut.cc
=== modified file 'storage/innobase/row/row0mysql.cc'
--- a/storage/innobase/row/row0mysql.cc	revid:kevin.lewis@stripped
+++ b/storage/innobase/row/row0mysql.cc	revid:kevin.lewis@stripped
@@ -3138,7 +3138,7 @@ row_truncate_table_for_mysql(
 			dict_index_t*	index;
 
 			/* Delete the link file if used. */
-			if (table->data_dir_path) {
+			if (DICT_TF_HAS_DATA_DIR(table->flags)) {
 				fil_delete_link_file(table->name);
 			}
 
@@ -3580,7 +3580,7 @@ retry:
 	}
 
 	/* Delete the link file if used. */
-	if (table->data_dir_path) {
+	if (DICT_TF_HAS_DATA_DIR(table->flags)) {
 		fil_delete_link_file(name);
 	}
 

No bundle (reason: useless for push emails).