Fixed bug#26595476 INCORRECT ERROR HANDLING IN ROW_IMPORT_FOR_MYSQL

We need to remove all the invalid code in these error handling code.

Approved by Sunny Bains <[email protected]>
RB: 17022

Author: Allen Lai

mysql-test/suite/innodb/r/table_encrypt_4.result

@@ -140,5 +140,12 @@ CREATE TABLE test.t1(c1 INT, c2 char(20)) ENGINE = InnoDB;
 ALTER TABLE test.t1 DISCARD TABLESPACE;
 ALTER TABLE test.t1 IMPORT TABLESPACE;
 ERROR HY000: Schema mismatch (Encryption attribute is no matched)
+# Import got expected error.
+DROP TABLE t1;
+CREATE TABLE test.t1(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
+ALTER TABLE test.t1 DISCARD TABLESPACE;
+SET SESSION DEBUG="+d, fsp_header_rotate_encryption_failure";
+ALTER TABLE test.t1 IMPORT TABLESPACE;
+ERROR HY000: Got error 168 from storage engine
 Warnings:
 Note	1051	Unknown table 'test.t1'

mysql-test/suite/innodb/t/table_encrypt_4.test

@@ -168,6 +168,19 @@ eval ALTER TABLE $dest_db.t1 DISCARD TABLESPACE;
 --error 1808
 eval ALTER TABLE $dest_db.t1 IMPORT TABLESPACE;
 
+--echo # Import got expected error.
+DROP TABLE t1;
+--remove_file $MYSQLD_DATADIR/$dest_db/t1.cfg
+--remove_file $MYSQLD_DATADIR/$dest_db/t1.cfp
+--remove_file $MYSQLD_DATADIR/$dest_db/t1.ibd
+eval CREATE TABLE $dest_db.t1(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;
+eval ALTER TABLE $dest_db.t1 DISCARD TABLESPACE;
+--copy_file $MYSQLD_DATADIR/t1.cfp_back $MYSQLD_DATADIR/$dest_db/t1.cfp
+--copy_file $MYSQLD_DATADIR/t1.ibd_back $MYSQLD_DATADIR/$dest_db/t1.ibd
+--copy_file $MYSQLD_DATADIR/t1.cfg_back $MYSQLD_DATADIR/$dest_db/t1.cfg
+SET SESSION DEBUG="+d, fsp_header_rotate_encryption_failure";
+--error ER_GET_ERRNO
+eval ALTER TABLE $dest_db.t1 IMPORT TABLESPACE;
 
 # Cleanup
 --disable_query_log

storage/innobase/fsp/fsp0fsp.cc

@@ -1005,6 +1005,9 @@ fsp_header_rotate_encryption(
 
 	const page_size_t	page_size(space->flags);
 
+	DBUG_EXECUTE_IF("fsp_header_rotate_encryption_failure",
+			return(false););
+
 	/* Fill encryption info. */
 	if (!fsp_header_fill_encryption_info(space,
 					     encrypt_info)) {

storage/innobase/row/row0import.cc

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2012, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2012, 2017, Oracle and/or its affiliates. All Rights Reserved.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -3952,14 +3952,7 @@ row_import_for_mysql(
 						  encrypt_info,
 						  &mtr)) {
 			mtr_commit(&mtr);
-			ib_senderrf(trx->mysql_thd, IB_LOG_LEVEL_ERROR,
-				ER_FILE_NOT_FOUND,
-				filepath, err, ut_strerr(err));
-
-			ut_free(filepath);
-			row_mysql_unlock_data_dictionary(trx);
-
-			return(row_import_cleanup(prebuilt, trx, err));
+			return(row_import_cleanup(prebuilt, trx, DB_ERROR));
 		}
 
 		mtr_commit(&mtr);