summaryrefslogtreecommitdiff
path: root/include/mysqld_error.h
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-06-04 11:39:33 +0300
committermonty@hundin.mysql.fi <>2002-06-04 11:39:33 +0300
commitab1a2731988f73ecb6df0452768e989ef735259d (patch)
treecb48233048aee1e7e30a1c0a68353e10a1fb6564 /include/mysqld_error.h
parent660844acd62d59d2aaed403a0189400752f11c57 (diff)
parent920a409ce920f7cb318da2c4eda9d33523ecbf06 (diff)
downloadmariadb-git-ab1a2731988f73ecb6df0452768e989ef735259d.tar.gz
Merge work:/my/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1
Diffstat (limited to 'include/mysqld_error.h')
-rw-r--r--include/mysqld_error.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/mysqld_error.h b/include/mysqld_error.h
index c910078331e..170a07422c3 100644
--- a/include/mysqld_error.h
+++ b/include/mysqld_error.h
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-/* Definefile for errormessagenumbers */
+/* Definefile for error messagenumbers */
#define ER_HASHCHK 1000
#define ER_NISAMCHK 1001
@@ -243,4 +243,6 @@
#define ER_MIXING_NOT_ALLOWED 1224
#define ER_DUP_ARGUMENT 1225
#define ER_USER_LIMIT_REACHED 1226
-#define ER_ERROR_MESSAGES 227
+#define ER_WRONG_FK_DEF 1227
+#define ER_KEY_REF_DO_NOT_MATCH_TABLE_REF 1228
+#define ER_ERROR_MESSAGES 229