Remove MYSQL_COMPRESSION.

The MariaDB 10.1 page_compression is incompatible with the Oracle
implementation that was introduced in MySQL 5.7 later.

Remove the Oracle implementation. Also remove the remaining traces of
MYSQL_ENCRYPTION.

This will also remove traces of PUNCH_HOLE until it is implemented
better. The only effective call to os_file_punch_hole() was in
fil_node_create_low() to test if the operation is supported for the file.

In other words, it looks like page_compression is not working in
MariaDB 10.2, because no code equivalent to the 10.1 os_file_trim()
is enabled.

1 files changed, 0 insertions, 38 deletions

diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
index 0c3a4e6bdae..21bcd381c87 100644
--- a/storage/innobase/row/row0mysql.cc
+++ b/storage/innobase/row/row0mysql.cc
@@ -2420,9 +2420,6 @@ row_create_table_for_mysql(
 	dict_table_t*	table,	/*!< in, own: table definition
 				(will be freed, or on DB_SUCCESS
 				added to the data dictionary cache) */
-	const char*	compression,
-				/*!< in: compression algorithm to use,
-				can be NULL */
 	trx_t*		trx,	/*!< in/out: transaction */
 	bool		commit,	/*!< in: if true, commit the transaction */
 	fil_encryption_t mode,	/*!< in: encryption mode */
@@ -2510,46 +2507,11 @@ err_exit:
 
 			/* We must delete the link file. */
 			RemoteDatafile::delete_link_file(table->name.m_name);
-
-		} else if (compression != NULL && compression[0] != '\0') {
-#ifdef MYSQL_COMPRESSION
-			ut_ad(!dict_table_in_shared_tablespace(table));
-
-			ut_ad(Compression::validate(compression) == DB_SUCCESS);
-
-			err = fil_set_compression(table, compression);
-
-			switch (err) {
-			case DB_SUCCESS:
-				break;
-			case DB_NOT_FOUND:
-			case DB_UNSUPPORTED:
-			case DB_IO_NO_PUNCH_HOLE_FS:
-				/* Return these errors */
-				break;
-			case DB_IO_NO_PUNCH_HOLE_TABLESPACE:
-				/* Page Compression will not be used. */
-				err = DB_SUCCESS;
-				break;
-			default:
-				ut_error;
-			}
-
-			/* We can check for file system punch hole support
-			only after creating the tablespace. On Windows
-			we can query that information but not on Linux. */
-			ut_ad(err == DB_SUCCESS
-				|| err == DB_IO_NO_PUNCH_HOLE_FS);
-#endif /* MYSQL_COMPRESSION */
-			
-			/* In non-strict mode we ignore dodgy compression
-			settings. */
 		}
 	}
 
 	switch (err) {
 	case DB_SUCCESS:
-	case DB_IO_NO_PUNCH_HOLE_FS:
 		break;
 	case DB_OUT_OF_FILE_SPACE:
 		trx->error_state = DB_SUCCESS;