misc after-merge changes:

* remove new InnoDB-specific ER_ and HA_ERR_ codes
* renamed few old ER_ and HA_ERR_ error messages to be less MyISAM-specific
* remove duplicate enum definitions (durability_properties, icp_result)
* move new mysql-test include files to their owner suite
* rename xtradb.rdiff files to *-disabled
* remove mistakenly committed helper perl module
* remove long obsolete handler::ha_statistic_increment() method
* restore the standard C xid_t structure to not have setters and getters
* remove xid_t::reset that was cleaning too much
* move MySQL-5.7 ER_ codes where they belong
* fir innodb to include service_wsrep.h not internal wsrep headers
* update tests and results

1 files changed, 8 insertions, 26 deletions

diff --git a/include/my_base.h b/include/my_base.h
index af053369f93..f5842685f9d 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -497,24 +497,19 @@ enum ha_base_keytype {
 #define HA_ERR_DISK_FULL          189
 #define HA_ERR_INCOMPATIBLE_DEFINITION 190
 #define HA_ERR_FTS_TOO_MANY_WORDS_IN_PHRASE 191 /* Too many words in a phrase */
-#define HA_ERR_DECRYPTION_FAILED  192 /* Table encrypted but
-						decypt failed */
+#define HA_ERR_DECRYPTION_FAILED  192 /* Table encrypted but decypt failed */
 #define HA_ERR_FK_DEPTH_EXCEEDED  193 /* FK cascade depth exceeded */
-#define HA_MISSING_CREATE_OPTION       194  /* Option Missing during Create */
-#define HA_ERR_SE_OUT_OF_MEMORY        195  /* Out of memory in storage engine */
-#define HA_ERR_TABLE_CORRUPT           196  /* Table/Clustered index is corrupted. */
-#define HA_ERR_QUERY_INTERRUPTED       197  /* The query was interrupted */
-#define HA_ERR_TABLESPACE_MISSING      198  /* Missing Tablespace */
-#define HA_ERR_TABLESPACE_IS_NOT_EMPTY 199  /* Tablespace is not empty */
-#define HA_ERR_WRONG_FILE_NAME         200  /* Invalid Filename */
-#define HA_ERR_NOT_ALLOWED_COMMAND     201  /* Operation is not allowed */
-#define HA_ERR_COMPUTE_FAILED          202  /* Compute generated column value failed */
-#define HA_ERR_INNODB_READ_ONLY        203  /* InnoDB is in read only mode */
-#define HA_ERR_LAST                    203  /* Copy of last error nr * */
+#define HA_ERR_TABLESPACE_MISSING 194  /* Missing Tablespace */
+#define HA_ERR_LAST               194  /* Copy of last error nr * */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
 
+/* aliases */
+#define HA_ERR_TABLE_CORRUPT HA_ERR_WRONG_IN_RECORD
+#define HA_ERR_QUERY_INTERRUPTED HA_ERR_ABORTED_BY_USER
+#define HA_ERR_NOT_ALLOWED_COMMAND HA_ERR_WRONG_COMMAND
+
 	/* Other constants */
 
 #define HA_NAMELEN 64			/* Max length of saved filename */
@@ -643,17 +638,4 @@ C_MODE_START
 typedef void (* invalidator_by_filename)(const char * filename);
 C_MODE_END
 
-
-enum durability_properties
-{
-  /*
-    Preserves the durability properties defined by the engine */
-  HA_REGULAR_DURABILITY= 0,
-  /* 
-     Ignore the durability properties defined by the engine and
-     write only in-memory entries.
-  */
-  HA_IGNORE_DURABILITY= 1
-};
-
 #endif /* _my_base_h */