bzr push into mysql-trunk branch (kevin.lewis:3990 to 3991)

[kevin.lewis]

 3991 kevin.lewis@stripped	2012-06-11
      Full 5980 patch against current mysql-trunk
      This has fixes for the the 2 tests that were recently failing.
      This also has a new test for ALTER TABLE including online
      ALTER for remote tablespaces so that the online alter process
      uses the same remote location for temporary and renamed
      tablespaces.  This was the first call stack in problem 13 in rb:956.

    added:
      mysql-test/include/shutdown_mysqld.inc
      mysql-test/include/start_mysqld.inc
      mysql-test/r/partition_innodb_tablespace.result
      mysql-test/suite/innodb/r/innodb-multiple-tablespaces.result
      mysql-test/suite/innodb/r/innodb-tablespace.result
      mysql-test/suite/innodb/r/innodb-wl5980-alter.result
      mysql-test/suite/innodb/r/innodb-wl5980-debug.result
      mysql-test/suite/innodb/r/innodb-wl5980-discard.result
      mysql-test/suite/innodb/r/innodb-wl5980-linux.result
      mysql-test/suite/innodb/r/innodb-wl5980-windows.result
      mysql-test/suite/innodb/t/innodb-multiple-tablespaces.test
      mysql-test/suite/innodb/t/innodb-tablespace.test
      mysql-test/suite/innodb/t/innodb-wl5980-alter.test
      mysql-test/suite/innodb/t/innodb-wl5980-debug.test
      mysql-test/suite/innodb/t/innodb-wl5980-discard.test
      mysql-test/suite/innodb/t/innodb-wl5980-linux.test
      mysql-test/suite/innodb/t/innodb-wl5980-windows.test
      mysql-test/suite/innodb/t/portability_wl5980_linux.zip
      mysql-test/suite/innodb/t/portability_wl5980_windows.zip
      mysql-test/suite/parts/r/partition_reorganize_innodb.result
      mysql-test/suite/parts/r/partition_reorganize_myisam.result
      mysql-test/suite/parts/t/partition_reorganize_innodb.test
      mysql-test/suite/parts/t/partition_reorganize_myisam.test
      mysql-test/t/partition_innodb_tablespace.test
    modified:
      include/my_base.h
      mysql-test/r/mysqlshow.result
      mysql-test/suite/innodb/r/innodb-alter-discard.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-alter-discard.test
      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
      mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
      mysql-test/suite/parts/t/partition_basic_symlink_innodb.test
      mysys/my_handler_errors.h
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_table.cc
      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/fts/fts0fts.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/fsp0fsp.h
      storage/innobase/include/fsp0fsp.ic
      storage/innobase/include/os0file.h
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0mysql.h
      storage/innobase/include/srv0start.h
      storage/innobase/lock/lock0lock.cc
      storage/innobase/os/os0file.cc
      storage/innobase/pars/pars0pars.cc
      storage/innobase/row/row0import.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0quiesce.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/trx/trx0rec.cc
      storage/innobase/ut/ut0ut.cc
 3990 Nirbhay Choubey	2012-06-11
      WL#5602, WL#5603
      
      * Fix for a generic-linux build failure. (#5602)
      * Fix for a warning on OS X (#5603)
      * Restoration of permissions for mysql.cc (rev#3075)

    modified:
      client/mysql.cc*
      libmysql/CMakeLists.txt
      mysys_ssl/my_default.cc

Diff too large for email (16708 lines, the limit is 10000).
No bundle (reason: useless for push emails).