summaryrefslogtreecommitdiff
path: root/include/my_base.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-02-03 15:22:39 +0100
committerSergei Golubchik <sergii@pisem.net>2014-02-03 15:22:39 +0100
commit72c20282db820b0b0818aea160a485bdca897eec (patch)
tree3089e022d958990fc0a405a38ba43ae00c87103c /include/my_base.h
parent5e1d5d9bc0bf9ea776bffe6c4914a84be920c0b2 (diff)
parent2acc01b3cfa27074f93016b893cda20fa0a3497f (diff)
downloadmariadb-git-72c20282db820b0b0818aea160a485bdca897eec.tar.gz
10.0-base merge
Diffstat (limited to 'include/my_base.h')
-rw-r--r--include/my_base.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h
index fcad2fc1a80..cc056bffa70 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -500,7 +500,8 @@ enum ha_base_keytype {
#define HA_ERR_ROW_NOT_VISIBLE 187
#define HA_ERR_ABORTED_BY_USER 188
#define HA_ERR_DISK_FULL 189
-#define HA_ERR_LAST 189 /* Copy of last error nr */
+#define HA_ERR_INCOMPATIBLE_DEFINITION 190
+#define HA_ERR_LAST 190 /* Copy of last error nr */
/* Number of different errors */
#define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1)