Commit da25c033 authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into myvenu.com:/home/venu/work/sql/dev-4.1

parents 0a1d7d64 83fd543e
...@@ -36,8 +36,8 @@ ER_CON_COUNT_ERROR, "08004", "", ...@@ -36,8 +36,8 @@ ER_CON_COUNT_ERROR, "08004", "",
ER_BAD_HOST_ERROR, "08S01", "", ER_BAD_HOST_ERROR, "08S01", "",
ER_HANDSHAKE_ERROR, "08S01", "", ER_HANDSHAKE_ERROR, "08S01", "",
ER_DBACCESS_DENIED_ERROR, "42000", "", ER_DBACCESS_DENIED_ERROR, "42000", "",
ER_ACCESS_DENIED_ERROR, "42000", "28000", ER_ACCESS_DENIED_ERROR, "28000", "",
ER_NO_DB_ERROR, "42000", "", ER_NO_DB_ERROR, "3D000", "",
ER_UNKNOWN_COM_ERROR, "08S01", "", ER_UNKNOWN_COM_ERROR, "08S01", "",
ER_BAD_NULL_ERROR, "23000", "", ER_BAD_NULL_ERROR, "23000", "",
ER_BAD_DB_ERROR, "42000", "", ER_BAD_DB_ERROR, "42000", "",
...@@ -68,7 +68,7 @@ ER_BLOB_USED_AS_KEY, "42000", "S1009", ...@@ -68,7 +68,7 @@ ER_BLOB_USED_AS_KEY, "42000", "S1009",
ER_TOO_BIG_FIELDLENGTH, "42000", "S1009", ER_TOO_BIG_FIELDLENGTH, "42000", "S1009",
ER_WRONG_AUTO_KEY, "42000", "S1009", ER_WRONG_AUTO_KEY, "42000", "S1009",
ER_FORCING_CLOSE, "08S01", "", ER_FORCING_CLOSE, "08S01", "",
ER_IPSOCK_ERROR, "088S01", "", ER_IPSOCK_ERROR, "08S01", "",
ER_NO_SUCH_INDEX, "42S12", "S1009", ER_NO_SUCH_INDEX, "42S12", "S1009",
ER_WRONG_FIELD_TERMINATORS, "42000", "S1009", ER_WRONG_FIELD_TERMINATORS, "42000", "S1009",
ER_BLOBS_AND_NO_TERMINATED, "42000", "S1009", ER_BLOBS_AND_NO_TERMINATED, "42000", "S1009",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment