summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-03-06 19:17:15 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-03-06 19:17:15 +0200
commit3da916246f17ad43b510e887068a0fb34879045c (patch)
tree94bfabcf3a08da57bba003efeba2c247ddabebee /include
parent9741017b1fdee99e1334fdd52ddbefbcb5feb10f (diff)
downloadmariadb-git-3da916246f17ad43b510e887068a0fb34879045c.tar.gz
Revert "Add extra HA_ERR message that Percona introduced within TokuDB 5.6.35-80"
This reverts commit fa59ac5055686403ce8b61936069b04d4392b9d1.
Diffstat (limited to 'include')
-rw-r--r--include/my_base.h3
-rw-r--r--include/my_handler_errors.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/include/my_base.h b/include/my_base.h
index c3feb521725..5c3dd8db9d9 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -502,8 +502,7 @@ 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_DEST_SCHEMA_NOT_EXIST 192 /* Destination schema does not exist */
-#define HA_ERR_LAST 192 /* Copy of last error nr */
+#define HA_ERR_LAST 191 /* Copy of last error nr */
/* Number of different errors */
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)
diff --git a/include/my_handler_errors.h b/include/my_handler_errors.h
index 9d2b19b6a22..a7afcfe93a3 100644
--- a/include/my_handler_errors.h
+++ b/include/my_handler_errors.h
@@ -94,8 +94,7 @@ static const char *handler_error_messages[]=
"Operation was interrupted by end user (probably kill command?)",
"Disk full",
"Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine. You have to dump and restore the table to fix this",
- "Too many words in a FTS phrase or proximity search",
- "Destination schema does not exist"
+ "Too many words in a FTS phrase or proximity search"
};
#endif /* MYSYS_MY_HANDLER_ERRORS_INCLUDED */