summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2004-04-08 00:19:43 +0300
committerbell@sanja.is.com.ua <>2004-04-08 00:19:43 +0300
commit56be6f3f9325f056b5343fc9a4a122f30e280d12 (patch)
tree8623a46473c8c2cb769c792a41b7a28bae698da7 /include
parent3b6c3dd2f5b2416a02b0a878187e977d9bf1d044 (diff)
parent5e37c41faee13cdc977842d253e6da0266766baf (diff)
downloadmariadb-git-56be6f3f9325f056b5343fc9a4a122f30e280d12.tar.gz
merge
Diffstat (limited to 'include')
-rw-r--r--include/mysqld_error.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index 6ae6111a8bb..3dabd226ae6 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -311,4 +311,5 @@
#define ER_TRUNCATED_WRONG_VALUE 1292
#define ER_TOO_MUCH_AUTO_TIMESTAMP_COLS 1293
#define ER_INVALID_ON_UPDATE 1294
-#define ER_ERROR_MESSAGES 295
+#define ER_UNSUPPORTED_PS 1295
+#define ER_ERROR_MESSAGES 296