Bug#60039: crash when exchanging a partition on

           nonpartitioned table with a view

Since the table was a view, it was never opened.
Due to this it crashed on null pointer reference.

Fixed by checking the tables before using it.

Author: Mattias Jonsson

mysql-test/r/partition_error.result

@@ -1,5 +1,15 @@
 drop table if exists t1, t2;
 #
+# Bug#60039: crash when exchanging a partition on
+#            nonpartitioned table with a view
+#
+CREATE TABLE t1 (a int);
+CREATE OR REPLACE VIEW v1 AS SELECT * FROM t1;
+ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE v1;
+ERROR 42000: Can't open table
+DROP VIEW v1;
+DROP TABLE t1;
+#
 # Bug#57924: crash when creating partitioned table with
 #            multiple columns in the partition key
 #

mysql-test/t/partition_error.test

@@ -10,6 +10,17 @@ drop table if exists t1, t2;
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
+--echo #
+--echo # Bug#60039: crash when exchanging a partition on
+--echo #            nonpartitioned table with a view
+--echo #
+CREATE TABLE t1 (a int);
+CREATE OR REPLACE VIEW v1 AS SELECT * FROM t1;
+--error ER_CHECK_NO_SUCH_TABLE
+ALTER TABLE t1 EXCHANGE PARTITION p0 WITH TABLE v1;
+DROP VIEW v1;
+DROP TABLE t1;
+
 --echo #
 --echo # Bug#57924: crash when creating partitioned table with
 --echo #            multiple columns in the partition key

sql/sql_partition_admin.cc

@@ -527,11 +527,12 @@ bool Sql_cmd_alter_table_exchange_partition::
 
   part_table= table_list->table;
   swap_table= swap_table_list->table;
-  table_hton= swap_table->file->ht;
 
   if (check_exchange_partition(swap_table, part_table))
     DBUG_RETURN(TRUE);
 
+  table_hton= swap_table->file->ht;
+
   thd_proc_info(thd, "verifying table");
 
   /* Will append the partition name later in part_info->get_part_elem() */