summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-10-31 03:22:31 +0200
committermonty@hundin.mysql.fi <>2001-10-31 03:22:31 +0200
commit5a9ce774dc413ac7b6342a9097f4e2456d0df63f (patch)
treea7cd1bf6f7f295d11ffce88081f69bc1963bfd06 /include
parent7f38949c6be7dba794a786b4fe53132f7f5751e5 (diff)
downloadmariadb-git-5a9ce774dc413ac7b6342a9097f4e2456d0df63f.tar.gz
Update for OS2 (patch from Yuri Dario).
Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts Fixed error messages. Fixed problem with const propagation when comparing columns of different types
Diffstat (limited to 'include')
-rw-r--r--include/mysqld_error.h18
1 files changed, 5 insertions, 13 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index af0c8508671..bfa279193b7 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -214,16 +214,8 @@
#define ER_NO_PERMISSON_TO_CREATE_USER 1211
#define ER_UNION_TABLES_IN_DIFFERENT_DIR 1212
#define ER_LOCK_DEADLOCK 1213
-#define ER_DUMMY1 1214
-#define ER_DUMMY2 1215
-#define ER_DUMMY3 1216
-#define ER_DUMMY4 1217
-#define ER_DUMMY5 1218
-#define ER_DUMMY6 1219
-#define ER_DUMMY7 1220
-#define ER_DUMMY8 1221
-#define ER_TABLE_CANT_HANDLE_FULLTEXT 1222
-#define ER_CANNOT_ADD_FOREIGN 1223
-#define ER_NO_REFERENCED_ROW 1224
-#define ER_ROW_IS_REFERENCED 1225
-#define ER_ERROR_MESSAGES 226
+#define ER_TABLE_CANT_HANDLE_FULLTEXT 1214
+#define ER_CANNOT_ADD_FOREIGN 1215
+#define ER_NO_REFERENCED_ROW 1216
+#define ER_ROW_IS_REFERENCED 1217
+#define ER_ERROR_MESSAGES 218