[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] =?utf-8?q?svn:_/php/php-src/_branches/PHP=5F5=5F3/ext/pdo=5Fmysql/get=5Ferror=5Fcodes.php_
From:       Johannes_Schlüter <johannes () php ! net>
Date:       2011-08-31 15:46:07
Message-ID: svn-johannes-1314805567-315905-1427367478 () svn ! php ! net
[Download RAW message or body]

johannes                                 Wed, 31 Aug 2011 15:46:07 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=315905

Log:
- Update PDO_mysql error mapping

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/pdo_mysql/get_error_codes.php
    U   php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_sqlstate.h
    U   php/php-src/branches/PHP_5_4/ext/pdo_mysql/get_error_codes.php
    U   php/php-src/branches/PHP_5_4/ext/pdo_mysql/php_pdo_mysql_sqlstate.h
    U   php/php-src/trunk/ext/pdo_mysql/get_error_codes.php
    U   php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_sqlstate.h


["svn-diffs-315905.txt" (text/x-diff)]

Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/get_error_codes.php
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/get_error_codes.php	2011-08-31 \
                15:44:01 UTC (rev 315904)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/get_error_codes.php	2011-08-31 \
15:46:07 UTC (rev 315905) @@ -5,7 +5,7 @@
 	while (!feof(STDIN)) {
 		$line = fgets(STDIN);

-		if (ereg('^(ER_.*),[[:space:]]+"(.*)",[[:space:]]+"(.*)"', $line, $matches)) {
+		if (ereg('^\{[[:space:]]+(ER_.*)[[:space:]]+,[[:space:]]*"(.*)",[[:space:]]*"(.*)"', \
$line, $matches)) {  $codes[$matches[1]] = $matches[2];
 			$maxlen = max($maxlen, strlen($matches[1]));
 		}
@@ -24,4 +24,4 @@
 	}


-?>
\ No newline at end of file
+?>

Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_sqlstate.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_sqlstate.h	2011-08-31 \
                15:44:01 UTC (rev 315904)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/php_pdo_mysql_sqlstate.h	2011-08-31 \
15:46:07 UTC (rev 315905) @@ -1,388 +1,646 @@
 /* DO NOT EDIT THIS FILE!!! It is auto generated by get_error_codes.php */
-#ifdef ER_DUP_KEY
-  case ER_DUP_KEY                           : return "23000";
+#ifdef ER_DUP_KEY
+  case ER_DUP_KEY                             : return "23000";
 #endif
-#ifdef ER_OUTOFMEMORY
-  case ER_OUTOFMEMORY                       : return "HY001";
+#ifdef ER_OUTOFMEMORY
+  case ER_OUTOFMEMORY                         : return "HY001";
 #endif
-#ifdef ER_OUT_OF_SORTMEMORY
-  case ER_OUT_OF_SORTMEMORY                 : return "HY001";
+#ifdef ER_OUT_OF_SORTMEMORY
+  case ER_OUT_OF_SORTMEMORY                   : return "HY001";
 #endif
-#ifdef ER_CON_COUNT_ERROR
-  case ER_CON_COUNT_ERROR                   : return "08004";
+#ifdef ER_CON_COUNT_ERROR
+  case ER_CON_COUNT_ERROR                     : return "08004";
 #endif
-#ifdef ER_BAD_HOST_ERROR
-  case ER_BAD_HOST_ERROR                    : return "08S01";
+#ifdef ER_BAD_HOST_ERROR
+  case ER_BAD_HOST_ERROR                      : return "08S01";
 #endif
-#ifdef ER_HANDSHAKE_ERROR
-  case ER_HANDSHAKE_ERROR                   : return "08S01";
+#ifdef ER_HANDSHAKE_ERROR
+  case ER_HANDSHAKE_ERROR                     : return "08S01";
 #endif
-#ifdef ER_DBACCESS_DENIED_ERROR
-  case ER_DBACCESS_DENIED_ERROR             : return "42000";
+#ifdef ER_DBACCESS_DENIED_ERROR
+  case ER_DBACCESS_DENIED_ERROR               : return "42000";
 #endif
-#ifdef ER_ACCESS_DENIED_ERROR
-  case ER_ACCESS_DENIED_ERROR               : return "28000";
+#ifdef ER_ACCESS_DENIED_ERROR
+  case ER_ACCESS_DENIED_ERROR                 : return "28000";
 #endif
-#ifdef ER_NO_DB_ERROR
-  case ER_NO_DB_ERROR                       : return "3D000";
+#ifdef ER_NO_DB_ERROR
+  case ER_NO_DB_ERROR                         : return "3D000";
 #endif
-#ifdef ER_UNKNOWN_COM_ERROR
-  case ER_UNKNOWN_COM_ERROR                 : return "08S01";
+#ifdef ER_UNKNOWN_COM_ERROR
+  case ER_UNKNOWN_COM_ERROR                   : return "08S01";
 #endif
-#ifdef ER_BAD_NULL_ERROR
-  case ER_BAD_NULL_ERROR                    : return "23000";
+#ifdef ER_BAD_NULL_ERROR
+  case ER_BAD_NULL_ERROR                      : return "23000";
 #endif
-#ifdef ER_BAD_DB_ERROR
-  case ER_BAD_DB_ERROR                      : return "42000";
+#ifdef ER_BAD_DB_ERROR
+  case ER_BAD_DB_ERROR                        : return "42000";
 #endif
-#ifdef ER_TABLE_EXISTS_ERROR
-  case ER_TABLE_EXISTS_ERROR                : return "42S01";
+#ifdef ER_TABLE_EXISTS_ERROR
+  case ER_TABLE_EXISTS_ERROR                  : return "42S01";
 #endif
-#ifdef ER_BAD_TABLE_ERROR
-  case ER_BAD_TABLE_ERROR                   : return "42S02";
+#ifdef ER_BAD_TABLE_ERROR
+  case ER_BAD_TABLE_ERROR                     : return "42S02";
 #endif
-#ifdef ER_NON_UNIQ_ERROR
-  case ER_NON_UNIQ_ERROR                    : return "23000";
+#ifdef ER_NON_UNIQ_ERROR
+  case ER_NON_UNIQ_ERROR                      : return "23000";
 #endif
-#ifdef ER_SERVER_SHUTDOWN
-  case ER_SERVER_SHUTDOWN                   : return "08S01";
+#ifdef ER_SERVER_SHUTDOWN
+  case ER_SERVER_SHUTDOWN                     : return "08S01";
 #endif
-#ifdef ER_BAD_FIELD_ERROR
-  case ER_BAD_FIELD_ERROR                   : return "42S22";
+#ifdef ER_BAD_FIELD_ERROR
+  case ER_BAD_FIELD_ERROR                     : return "42S22";
 #endif
-#ifdef ER_WRONG_FIELD_WITH_GROUP
-  case ER_WRONG_FIELD_WITH_GROUP            : return "42000";
+#ifdef ER_WRONG_FIELD_WITH_GROUP
+  case ER_WRONG_FIELD_WITH_GROUP              : return "42000";
 #endif
-#ifdef ER_WRONG_GROUP_FIELD
-  case ER_WRONG_GROUP_FIELD                 : return "42000";
+#ifdef ER_WRONG_GROUP_FIELD
+  case ER_WRONG_GROUP_FIELD                   : return "42000";
 #endif
-#ifdef ER_WRONG_SUM_SELECT
-  case ER_WRONG_SUM_SELECT                  : return "42000";
+#ifdef ER_WRONG_SUM_SELECT
+  case ER_WRONG_SUM_SELECT                    : return "42000";
 #endif
-#ifdef ER_WRONG_VALUE_COUNT
-  case ER_WRONG_VALUE_COUNT                 : return "21S01";
+#ifdef ER_WRONG_VALUE_COUNT
+  case ER_WRONG_VALUE_COUNT                   : return "21S01";
 #endif
-#ifdef ER_TOO_LONG_IDENT
-  case ER_TOO_LONG_IDENT                    : return "42000";
+#ifdef ER_TOO_LONG_IDENT
+  case ER_TOO_LONG_IDENT                      : return "42000";
 #endif
-#ifdef ER_DUP_FIELDNAME
-  case ER_DUP_FIELDNAME                     : return "42S21";
+#ifdef ER_DUP_FIELDNAME
+  case ER_DUP_FIELDNAME                       : return "42S21";
 #endif
-#ifdef ER_DUP_KEYNAME
-  case ER_DUP_KEYNAME                       : return "42000";
+#ifdef ER_DUP_KEYNAME
+  case ER_DUP_KEYNAME                         : return "42000";
 #endif
-#ifdef ER_DUP_ENTRY
-  case ER_DUP_ENTRY                         : return "23000";
+#ifdef ER_DUP_ENTRY
+  case ER_DUP_ENTRY                           : return "23000";
 #endif
-#ifdef ER_WRONG_FIELD_SPEC
-  case ER_WRONG_FIELD_SPEC                  : return "42000";
+#ifdef ER_WRONG_FIELD_SPEC
+  case ER_WRONG_FIELD_SPEC                    : return "42000";
 #endif
-#ifdef ER_PARSE_ERROR
-  case ER_PARSE_ERROR                       : return "42000";
+#ifdef ER_PARSE_ERROR
+  case ER_PARSE_ERROR                         : return "42000";
 #endif
-#ifdef ER_NONUNIQ_TABLE
-  case ER_NONUNIQ_TABLE                     : return "42000";
+#ifdef ER_EMPTY_QUERY
+  case ER_EMPTY_QUERY                         : return "42000";
 #endif
-#ifdef ER_INVALID_DEFAULT
-  case ER_INVALID_DEFAULT                   : return "42000";
+#ifdef ER_NONUNIQ_TABLE
+  case ER_NONUNIQ_TABLE                       : return "42000";
 #endif
-#ifdef ER_MULTIPLE_PRI_KEY
-  case ER_MULTIPLE_PRI_KEY                  : return "42000";
+#ifdef ER_INVALID_DEFAULT
+  case ER_INVALID_DEFAULT                     : return "42000";
 #endif
-#ifdef ER_TOO_MANY_KEYS
-  case ER_TOO_MANY_KEYS                     : return "42000";
+#ifdef ER_MULTIPLE_PRI_KEY
+  case ER_MULTIPLE_PRI_KEY                    : return "42000";
 #endif
-#ifdef ER_TOO_MANY_KEY_PARTS
-  case ER_TOO_MANY_KEY_PARTS                : return "42000";
+#ifdef ER_TOO_MANY_KEYS
+  case ER_TOO_MANY_KEYS                       : return "42000";
 #endif
-#ifdef ER_TOO_LONG_KEY
-  case ER_TOO_LONG_KEY                      : return "42000";
+#ifdef ER_TOO_MANY_KEY_PARTS
+  case ER_TOO_MANY_KEY_PARTS                  : return "42000";
 #endif
-#ifdef ER_KEY_COLUMN_DOES_NOT_EXITS
-  case ER_KEY_COLUMN_DOES_NOT_EXITS         : return "42000";
+#ifdef ER_TOO_LONG_KEY
+  case ER_TOO_LONG_KEY                        : return "42000";
 #endif
-#ifdef ER_BLOB_USED_AS_KEY
-  case ER_BLOB_USED_AS_KEY                  : return "42000";
+#ifdef ER_KEY_COLUMN_DOES_NOT_EXITS
+  case ER_KEY_COLUMN_DOES_NOT_EXITS           : return "42000";
 #endif
-#ifdef ER_TOO_BIG_FIELDLENGTH
-  case ER_TOO_BIG_FIELDLENGTH               : return "42000";
+#ifdef ER_BLOB_USED_AS_KEY
+  case ER_BLOB_USED_AS_KEY                    : return "42000";
 #endif
-#ifdef ER_WRONG_AUTO_KEY
-  case ER_WRONG_AUTO_KEY                    : return "42000";
+#ifdef ER_TOO_BIG_FIELDLENGTH
+  case ER_TOO_BIG_FIELDLENGTH                 : return "42000";
 #endif
-#ifdef ER_FORCING_CLOSE
-  case ER_FORCING_CLOSE                     : return "08S01";
+#ifdef ER_WRONG_AUTO_KEY
+  case ER_WRONG_AUTO_KEY                      : return "42000";
 #endif
-#ifdef ER_IPSOCK_ERROR
-  case ER_IPSOCK_ERROR                      : return "08S01";
+#ifdef ER_FORCING_CLOSE
+  case ER_FORCING_CLOSE                       : return "08S01";
 #endif
-#ifdef ER_NO_SUCH_INDEX
-  case ER_NO_SUCH_INDEX                     : return "42S12";
+#ifdef ER_IPSOCK_ERROR
+  case ER_IPSOCK_ERROR                        : return "08S01";
 #endif
-#ifdef ER_WRONG_FIELD_TERMINATORS
-  case ER_WRONG_FIELD_TERMINATORS           : return "42000";
+#ifdef ER_NO_SUCH_INDEX
+  case ER_NO_SUCH_INDEX                       : return "42S12";
 #endif
-#ifdef ER_BLOBS_AND_NO_TERMINATED
-  case ER_BLOBS_AND_NO_TERMINATED           : return "42000";
+#ifdef ER_WRONG_FIELD_TERMINATORS
+  case ER_WRONG_FIELD_TERMINATORS             : return "42000";
 #endif
-#ifdef ER_CANT_REMOVE_ALL_FIELDS
-  case ER_CANT_REMOVE_ALL_FIELDS            : return "42000";
+#ifdef ER_BLOBS_AND_NO_TERMINATED
+  case ER_BLOBS_AND_NO_TERMINATED             : return "42000";
 #endif
-#ifdef ER_CANT_DROP_FIELD_OR_KEY
-  case ER_CANT_DROP_FIELD_OR_KEY            : return "42000";
+#ifdef ER_CANT_REMOVE_ALL_FIELDS
+  case ER_CANT_REMOVE_ALL_FIELDS              : return "42000";
 #endif
-#ifdef ER_BLOB_CANT_HAVE_DEFAULT
-  case ER_BLOB_CANT_HAVE_DEFAULT            : return "42000";
+#ifdef ER_CANT_DROP_FIELD_OR_KEY
+  case ER_CANT_DROP_FIELD_OR_KEY              : return "42000";
 #endif
-#ifdef ER_WRONG_DB_NAME
-  case ER_WRONG_DB_NAME                     : return "42000";
+#ifdef ER_BLOB_CANT_HAVE_DEFAULT
+  case ER_BLOB_CANT_HAVE_DEFAULT              : return "42000";
 #endif
-#ifdef ER_WRONG_TABLE_NAME
-  case ER_WRONG_TABLE_NAME                  : return "42000";
+#ifdef ER_WRONG_DB_NAME
+  case ER_WRONG_DB_NAME                       : return "42000";
 #endif
-#ifdef ER_TOO_BIG_SELECT
-  case ER_TOO_BIG_SELECT                    : return "42000";
+#ifdef ER_WRONG_TABLE_NAME
+  case ER_WRONG_TABLE_NAME                    : return "42000";
 #endif
-#ifdef ER_UNKNOWN_PROCEDURE
-  case ER_UNKNOWN_PROCEDURE                 : return "42000";
+#ifdef ER_TOO_BIG_SELECT
+  case ER_TOO_BIG_SELECT                      : return "42000";
 #endif
-#ifdef ER_WRONG_PARAMCOUNT_TO_PROCEDURE
-  case ER_WRONG_PARAMCOUNT_TO_PROCEDURE     : return "42000";
+#ifdef ER_UNKNOWN_PROCEDURE
+  case ER_UNKNOWN_PROCEDURE                   : return "42000";
 #endif
-#ifdef ER_UNKNOWN_TABLE
-  case ER_UNKNOWN_TABLE                     : return "42S02";
+#ifdef ER_WRONG_PARAMCOUNT_TO_PROCEDURE
+  case ER_WRONG_PARAMCOUNT_TO_PROCEDURE       : return "42000";
 #endif
-#ifdef ER_FIELD_SPECIFIED_TWICE
-  case ER_FIELD_SPECIFIED_TWICE             : return "42000";
+#ifdef ER_UNKNOWN_TABLE
+  case ER_UNKNOWN_TABLE                       : return "42S02";
 #endif
-#ifdef ER_UNSUPPORTED_EXTENSION
-  case ER_UNSUPPORTED_EXTENSION             : return "42000";
+#ifdef ER_FIELD_SPECIFIED_TWICE
+  case ER_FIELD_SPECIFIED_TWICE               : return "42000";
 #endif
-#ifdef ER_TABLE_MUST_HAVE_COLUMNS
-  case ER_TABLE_MUST_HAVE_COLUMNS           : return "42000";
+#ifdef ER_UNSUPPORTED_EXTENSION
+  case ER_UNSUPPORTED_EXTENSION               : return "42000";
 #endif
-#ifdef ER_UNKNOWN_CHARACTER_SET
-  case ER_UNKNOWN_CHARACTER_SET             : return "42000";
+#ifdef ER_TABLE_MUST_HAVE_COLUMNS
+  case ER_TABLE_MUST_HAVE_COLUMNS             : return "42000";
 #endif
-#ifdef ER_TOO_BIG_ROWSIZE
-  case ER_TOO_BIG_ROWSIZE                   : return "42000";
+#ifdef ER_UNKNOWN_CHARACTER_SET
+  case ER_UNKNOWN_CHARACTER_SET               : return "42000";
 #endif
-#ifdef ER_WRONG_OUTER_JOIN
-  case ER_WRONG_OUTER_JOIN                  : return "42000";
+#ifdef ER_TOO_BIG_ROWSIZE
+  case ER_TOO_BIG_ROWSIZE                     : return "42000";
 #endif
-#ifdef ER_NULL_COLUMN_IN_INDEX
-  case ER_NULL_COLUMN_IN_INDEX              : return "42000";
+#ifdef ER_WRONG_OUTER_JOIN
+  case ER_WRONG_OUTER_JOIN                    : return "42000";
 #endif
-#ifdef ER_PASSWORD_ANONYMOUS_USER
-  case ER_PASSWORD_ANONYMOUS_USER           : return "42000";
+#ifdef ER_NULL_COLUMN_IN_INDEX
+  case ER_NULL_COLUMN_IN_INDEX                : return "42000";
 #endif
-#ifdef ER_PASSWORD_NOT_ALLOWED
-  case ER_PASSWORD_NOT_ALLOWED              : return "42000";
+#ifdef ER_PASSWORD_ANONYMOUS_USER
+  case ER_PASSWORD_ANONYMOUS_USER             : return "42000";
 #endif
-#ifdef ER_PASSWORD_NO_MATCH
-  case ER_PASSWORD_NO_MATCH                 : return "42000";
+#ifdef ER_PASSWORD_NOT_ALLOWED
+  case ER_PASSWORD_NOT_ALLOWED                : return "42000";
 #endif
-#ifdef ER_WRONG_VALUE_COUNT_ON_ROW
-  case ER_WRONG_VALUE_COUNT_ON_ROW          : return "21S01";
+#ifdef ER_PASSWORD_NO_MATCH
+  case ER_PASSWORD_NO_MATCH                   : return "42000";
 #endif
-#ifdef ER_INVALID_USE_OF_NULL
-  case ER_INVALID_USE_OF_NULL               : return "42000";
+#ifdef ER_WRONG_VALUE_COUNT_ON_ROW
+  case ER_WRONG_VALUE_COUNT_ON_ROW            : return "21S01";
 #endif
-#ifdef ER_REGEXP_ERROR
-  case ER_REGEXP_ERROR                      : return "42000";
+#ifdef ER_INVALID_USE_OF_NULL
+  case ER_INVALID_USE_OF_NULL                 : return "22004";
 #endif
-#ifdef ER_NONEXISTING_GRANT
-  case ER_NONEXISTING_GRANT                 : return "42000";
+#ifdef ER_REGEXP_ERROR
+  case ER_REGEXP_ERROR                        : return "42000";
 #endif
-#ifdef ER_TABLEACCESS_DENIED_ERROR
-  case ER_TABLEACCESS_DENIED_ERROR          : return "42000";
+#ifdef ER_MIX_OF_GROUP_FUNC_AND_FIELDS
+  case ER_MIX_OF_GROUP_FUNC_AND_FIELDS        : return "42000";
 #endif
-#ifdef ER_COLUMNACCESS_DENIED_ERROR
-  case ER_COLUMNACCESS_DENIED_ERROR         : return "42000";
+#ifdef ER_NONEXISTING_GRANT
+  case ER_NONEXISTING_GRANT                   : return "42000";
 #endif
-#ifdef ER_ILLEGAL_GRANT_FOR_TABLE
-  case ER_ILLEGAL_GRANT_FOR_TABLE           : return "42000";
+#ifdef ER_TABLEACCESS_DENIED_ERROR
+  case ER_TABLEACCESS_DENIED_ERROR            : return "42000";
 #endif
-#ifdef ER_GRANT_WRONG_HOST_OR_USER
-  case ER_GRANT_WRONG_HOST_OR_USER          : return "42000";
+#ifdef ER_COLUMNACCESS_DENIED_ERROR
+  case ER_COLUMNACCESS_DENIED_ERROR           : return "42000";
 #endif
-#ifdef ER_NO_SUCH_TABLE
-  case ER_NO_SUCH_TABLE                     : return "42S02";
+#ifdef ER_ILLEGAL_GRANT_FOR_TABLE
+  case ER_ILLEGAL_GRANT_FOR_TABLE             : return "42000";
 #endif
-#ifdef ER_NONEXISTING_TABLE_GRANT
-  case ER_NONEXISTING_TABLE_GRANT           : return "42000";
+#ifdef ER_GRANT_WRONG_HOST_OR_USER
+  case ER_GRANT_WRONG_HOST_OR_USER            : return "42000";
 #endif
-#ifdef ER_NOT_ALLOWED_COMMAND
-  case ER_NOT_ALLOWED_COMMAND               : return "42000";
+#ifdef ER_NO_SUCH_TABLE
+  case ER_NO_SUCH_TABLE                       : return "42S02";
 #endif
-#ifdef ER_SYNTAX_ERROR
-  case ER_SYNTAX_ERROR                      : return "42000";
+#ifdef ER_NONEXISTING_TABLE_GRANT
+  case ER_NONEXISTING_TABLE_GRANT             : return "42000";
 #endif
-#ifdef ER_ABORTING_CONNECTION
-  case ER_ABORTING_CONNECTION               : return "08S01";
+#ifdef ER_NOT_ALLOWED_COMMAND
+  case ER_NOT_ALLOWED_COMMAND                 : return "42000";
 #endif
-#ifdef ER_NET_PACKET_TOO_LARGE
-  case ER_NET_PACKET_TOO_LARGE              : return "08S01";
+#ifdef ER_SYNTAX_ERROR
+  case ER_SYNTAX_ERROR                        : return "42000";
 #endif
-#ifdef ER_NET_READ_ERROR_FROM_PIPE
-  case ER_NET_READ_ERROR_FROM_PIPE          : return "08S01";
+#ifdef ER_ABORTING_CONNECTION
+  case ER_ABORTING_CONNECTION                 : return "08S01";
 #endif
-#ifdef ER_NET_FCNTL_ERROR
-  case ER_NET_FCNTL_ERROR                   : return "08S01";
+#ifdef ER_NET_PACKET_TOO_LARGE
+  case ER_NET_PACKET_TOO_LARGE                : return "08S01";
 #endif
-#ifdef ER_NET_PACKETS_OUT_OF_ORDER
-  case ER_NET_PACKETS_OUT_OF_ORDER          : return "08S01";
+#ifdef ER_NET_READ_ERROR_FROM_PIPE
+  case ER_NET_READ_ERROR_FROM_PIPE            : return "08S01";
 #endif
-#ifdef ER_NET_UNCOMPRESS_ERROR
-  case ER_NET_UNCOMPRESS_ERROR              : return "08S01";
+#ifdef ER_NET_FCNTL_ERROR
+  case ER_NET_FCNTL_ERROR                     : return "08S01";
 #endif
-#ifdef ER_NET_READ_ERROR
-  case ER_NET_READ_ERROR                    : return "08S01";
+#ifdef ER_NET_PACKETS_OUT_OF_ORDER
+  case ER_NET_PACKETS_OUT_OF_ORDER            : return "08S01";
 #endif
-#ifdef ER_NET_READ_INTERRUPTED
-  case ER_NET_READ_INTERRUPTED              : return "08S01";
+#ifdef ER_NET_UNCOMPRESS_ERROR
+  case ER_NET_UNCOMPRESS_ERROR                : return "08S01";
 #endif
-#ifdef ER_NET_ERROR_ON_WRITE
-  case ER_NET_ERROR_ON_WRITE                : return "08S01";
+#ifdef ER_NET_READ_ERROR
+  case ER_NET_READ_ERROR                      : return "08S01";
 #endif
-#ifdef ER_NET_WRITE_INTERRUPTED
-  case ER_NET_WRITE_INTERRUPTED             : return "08S01";
+#ifdef ER_NET_READ_INTERRUPTED
+  case ER_NET_READ_INTERRUPTED                : return "08S01";
 #endif
-#ifdef ER_TOO_LONG_STRING
-  case ER_TOO_LONG_STRING                   : return "42000";
+#ifdef ER_NET_ERROR_ON_WRITE
+  case ER_NET_ERROR_ON_WRITE                  : return "08S01";
 #endif
-#ifdef ER_TABLE_CANT_HANDLE_BLOB
-  case ER_TABLE_CANT_HANDLE_BLOB            : return "42000";
+#ifdef ER_NET_WRITE_INTERRUPTED
+  case ER_NET_WRITE_INTERRUPTED               : return "08S01";
 #endif
-#ifdef ER_TABLE_CANT_HANDLE_AUTO_INCREMENT
-  case ER_TABLE_CANT_HANDLE_AUTO_INCREMENT  : return "42000";
+#ifdef ER_TOO_LONG_STRING
+  case ER_TOO_LONG_STRING                     : return "42000";
 #endif
-#ifdef ER_WRONG_COLUMN_NAME
-  case ER_WRONG_COLUMN_NAME                 : return "42000";
+#ifdef ER_TABLE_CANT_HANDLE_BLOB
+  case ER_TABLE_CANT_HANDLE_BLOB              : return "42000";
 #endif
-#ifdef ER_WRONG_KEY_COLUMN
-  case ER_WRONG_KEY_COLUMN                  : return "42000";
+#ifdef ER_TABLE_CANT_HANDLE_AUTO_INCREMENT
+  case ER_TABLE_CANT_HANDLE_AUTO_INCREMENT    : return "42000";
 #endif
-#ifdef ER_DUP_UNIQUE
-  case ER_DUP_UNIQUE                        : return "23000";
+#ifdef ER_WRONG_COLUMN_NAME
+  case ER_WRONG_COLUMN_NAME                   : return "42000";
 #endif
-#ifdef ER_BLOB_KEY_WITHOUT_LENGTH
-  case ER_BLOB_KEY_WITHOUT_LENGTH           : return "42000";
+#ifdef ER_WRONG_KEY_COLUMN
+  case ER_WRONG_KEY_COLUMN                    : return "42000";
 #endif
-#ifdef ER_PRIMARY_CANT_HAVE_NULL
-  case ER_PRIMARY_CANT_HAVE_NULL            : return "42000";
+#ifdef ER_DUP_UNIQUE
+  case ER_DUP_UNIQUE                          : return "23000";
 #endif
-#ifdef ER_TOO_MANY_ROWS
-  case ER_TOO_MANY_ROWS                     : return "42000";
+#ifdef ER_BLOB_KEY_WITHOUT_LENGTH
+  case ER_BLOB_KEY_WITHOUT_LENGTH             : return "42000";
 #endif
-#ifdef ER_REQUIRES_PRIMARY_KEY
-  case ER_REQUIRES_PRIMARY_KEY              : return "42000";
+#ifdef ER_PRIMARY_CANT_HAVE_NULL
+  case ER_PRIMARY_CANT_HAVE_NULL              : return "42000";
 #endif
-#ifdef ER_CHECK_NO_SUCH_TABLE
-  case ER_CHECK_NO_SUCH_TABLE               : return "42000";
+#ifdef ER_TOO_MANY_ROWS
+  case ER_TOO_MANY_ROWS                       : return "42000";
 #endif
-#ifdef ER_CHECK_NOT_IMPLEMENTED
-  case ER_CHECK_NOT_IMPLEMENTED             : return "42000";
+#ifdef ER_REQUIRES_PRIMARY_KEY
+  case ER_REQUIRES_PRIMARY_KEY                : return "42000";
 #endif
-#ifdef ER_CANT_DO_THIS_DURING_AN_TRANSACTION
-  case ER_CANT_DO_THIS_DURING_AN_TRANSACTION: return "25000";
+#ifdef ER_KEY_DOES_NOT_EXITS
+  case ER_KEY_DOES_NOT_EXITS                  : return "42000";
 #endif
-#ifdef ER_NEW_ABORTING_CONNECTION
-  case ER_NEW_ABORTING_CONNECTION           : return "08S01";
+#ifdef ER_CHECK_NO_SUCH_TABLE
+  case ER_CHECK_NO_SUCH_TABLE                 : return "42000";
 #endif
-#ifdef ER_MASTER_NET_READ
-  case ER_MASTER_NET_READ                   : return "08S01";
+#ifdef ER_CHECK_NOT_IMPLEMENTED
+  case ER_CHECK_NOT_IMPLEMENTED               : return "42000";
 #endif
-#ifdef ER_MASTER_NET_WRITE
-  case ER_MASTER_NET_WRITE                  : return "08S01";
+#ifdef ER_CANT_DO_THIS_DURING_AN_TRANSACTION
+  case ER_CANT_DO_THIS_DURING_AN_TRANSACTION  : return "25000";
 #endif
-#ifdef ER_TOO_MANY_USER_CONNECTIONS
-  case ER_TOO_MANY_USER_CONNECTIONS         : return "42000";
+#ifdef ER_NEW_ABORTING_CONNECTION
+  case ER_NEW_ABORTING_CONNECTION             : return "08S01";
 #endif
-#ifdef ER_READ_ONLY_TRANSACTION
-  case ER_READ_ONLY_TRANSACTION             : return "25000";
+#ifdef ER_MASTER_NET_READ
+  case ER_MASTER_NET_READ                     : return "08S01";
 #endif
-#ifdef ER_LOCK_DEADLOCK
-  case ER_LOCK_DEADLOCK                     : return "40001";
+#ifdef ER_MASTER_NET_WRITE
+  case ER_MASTER_NET_WRITE                    : return "08S01";
 #endif
-#ifdef ER_NO_REFERENCED_ROW
-  case ER_NO_REFERENCED_ROW                 : return "23000";
+#ifdef ER_TOO_MANY_USER_CONNECTIONS
+  case ER_TOO_MANY_USER_CONNECTIONS           : return "42000";
 #endif
-#ifdef ER_ROW_IS_REFERENCED
-  case ER_ROW_IS_REFERENCED                 : return "23000";
+#ifdef ER_READ_ONLY_TRANSACTION
+  case ER_READ_ONLY_TRANSACTION               : return "25000";
 #endif
-#ifdef ER_CONNECT_TO_MASTER
-  case ER_CONNECT_TO_MASTER                 : return "08S01";
+#ifdef ER_NO_PERMISSION_TO_CREATE_USER
+  case ER_NO_PERMISSION_TO_CREATE_USER        : return "42000";
 #endif
-#ifdef ER_USER_LIMIT_REACHED
-  case ER_USER_LIMIT_REACHED                : return "42000";
+#ifdef ER_LOCK_DEADLOCK
+  case ER_LOCK_DEADLOCK                       : return "40001";
 #endif
-#ifdef ER_NO_DEFAULT
-  case ER_NO_DEFAULT                        : return "42000";
+#ifdef ER_NO_REFERENCED_ROW
+  case ER_NO_REFERENCED_ROW                   : return "23000";
 #endif
-#ifdef ER_WRONG_VALUE_FOR_VAR
-  case ER_WRONG_VALUE_FOR_VAR               : return "42000";
+#ifdef ER_ROW_IS_REFERENCED
+  case ER_ROW_IS_REFERENCED                   : return "23000";
 #endif
-#ifdef ER_WRONG_TYPE_FOR_VAR
-  case ER_WRONG_TYPE_FOR_VAR                : return "42000";
+#ifdef ER_CONNECT_TO_MASTER
+  case ER_CONNECT_TO_MASTER                   : return "08S01";
 #endif
-#ifdef ER_CANT_USE_OPTION_HERE
-  case ER_CANT_USE_OPTION_HERE              : return "42000";
+#ifdef ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT
+  case ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT   : return "21000";
 #endif
-#ifdef ER_NOT_SUPPORTED_YET
-  case ER_NOT_SUPPORTED_YET                 : return "42000";
+#ifdef ER_USER_LIMIT_REACHED
+  case ER_USER_LIMIT_REACHED                  : return "42000";
 #endif
-#ifdef ER_WRONG_FK_DEF
-  case ER_WRONG_FK_DEF                      : return "42000";
+#ifdef ER_SPECIFIC_ACCESS_DENIED_ERROR
+  case ER_SPECIFIC_ACCESS_DENIED_ERROR        : return "42000";
 #endif
-#ifdef ER_OPERAND_COLUMNS
-  case ER_OPERAND_COLUMNS                   : return "21000";
+#ifdef ER_NO_DEFAULT
+  case ER_NO_DEFAULT                          : return "42000";
 #endif
-#ifdef ER_SUBQUERY_NO_1_ROW
-  case ER_SUBQUERY_NO_1_ROW                 : return "21000";
+#ifdef ER_WRONG_VALUE_FOR_VAR
+  case ER_WRONG_VALUE_FOR_VAR                 : return "42000";
 #endif
-#ifdef ER_ILLEGAL_REFERENCE
-  case ER_ILLEGAL_REFERENCE                 : return "42S22";
+#ifdef ER_WRONG_TYPE_FOR_VAR
+  case ER_WRONG_TYPE_FOR_VAR                  : return "42000";
 #endif
-#ifdef ER_DERIVED_MUST_HAVE_ALIAS
-  case ER_DERIVED_MUST_HAVE_ALIAS           : return "42000";
+#ifdef ER_CANT_USE_OPTION_HERE
+  case ER_CANT_USE_OPTION_HERE                : return "42000";
 #endif
-#ifdef ER_SELECT_REDUCED
-  case ER_SELECT_REDUCED                    : return "01000";
+#ifdef ER_NOT_SUPPORTED_YET
+  case ER_NOT_SUPPORTED_YET                   : return "42000";
 #endif
-#ifdef ER_TABLENAME_NOT_ALLOWED_HERE
-  case ER_TABLENAME_NOT_ALLOWED_HERE        : return "42000";
+#ifdef ER_WRONG_FK_DEF
+  case ER_WRONG_FK_DEF                        : return "42000";
 #endif
-#ifdef ER_NOT_SUPPORTED_AUTH_MODE
-  case ER_NOT_SUPPORTED_AUTH_MODE           : return "08004";
+#ifdef ER_OPERAND_COLUMNS
+  case ER_OPERAND_COLUMNS                     : return "21000";
 #endif
-#ifdef ER_SPATIAL_CANT_HAVE_NULL
-  case ER_SPATIAL_CANT_HAVE_NULL            : return "42000";
+#ifdef ER_SUBQUERY_NO_1_ROW
+  case ER_SUBQUERY_NO_1_ROW                   : return "21000";
 #endif
-#ifdef ER_COLLATION_CHARSET_MISMATCH
-  case ER_COLLATION_CHARSET_MISMATCH        : return "42000";
+#ifdef ER_ILLEGAL_REFERENCE
+  case ER_ILLEGAL_REFERENCE                   : return "42S22";
 #endif
-#ifdef ER_WARN_TOO_FEW_RECORDS
-  case ER_WARN_TOO_FEW_RECORDS              : return "01000";
+#ifdef ER_DERIVED_MUST_HAVE_ALIAS
+  case ER_DERIVED_MUST_HAVE_ALIAS             : return "42000";
 #endif
-#ifdef ER_WARN_TOO_MANY_RECORDS
-  case ER_WARN_TOO_MANY_RECORDS             : return "01000";
+#ifdef ER_SELECT_REDUCED
+  case ER_SELECT_REDUCED                      : return "01000";
 #endif
-#ifdef ER_WARN_NULL_TO_NOTNULL
-  case ER_WARN_NULL_TO_NOTNULL              : return "01000";
+#ifdef ER_TABLENAME_NOT_ALLOWED_HERE
+  case ER_TABLENAME_NOT_ALLOWED_HERE          : return "42000";
 #endif
-#ifdef ER_WARN_DATA_OUT_OF_RANGE
-  case ER_WARN_DATA_OUT_OF_RANGE            : return "01000";
+#ifdef ER_NOT_SUPPORTED_AUTH_MODE
+  case ER_NOT_SUPPORTED_AUTH_MODE             : return "08004";
 #endif
-#ifdef ER_WARN_DATA_TRUNCATED
-  case ER_WARN_DATA_TRUNCATED               : return "01000";
+#ifdef ER_SPATIAL_CANT_HAVE_NULL
+  case ER_SPATIAL_CANT_HAVE_NULL              : return "42000";
 #endif
-#ifdef ER_WRONG_NAME_FOR_INDEX
-  case ER_WRONG_NAME_FOR_INDEX              : return "42000";
+#ifdef ER_COLLATION_CHARSET_MISMATCH
+  case ER_COLLATION_CHARSET_MISMATCH          : return "42000";
 #endif
-#ifdef ER_WRONG_NAME_FOR_CATALOG
-  case ER_WRONG_NAME_FOR_CATALOG            : return "42000";
+#ifdef ER_WARN_TOO_FEW_RECORDS
+  case ER_WARN_TOO_FEW_RECORDS                : return "01000";
 #endif
-#ifdef ER_UNKNOWN_STORAGE_ENGINE
-  case ER_UNKNOWN_STORAGE_ENGINE            : return "42000";
+#ifdef ER_WARN_TOO_MANY_RECORDS
+  case ER_WARN_TOO_MANY_RECORDS               : return "01000";
 #endif
+#ifdef ER_WARN_NULL_TO_NOTNULL
+  case ER_WARN_NULL_TO_NOTNULL                : return "22004";
+#endif
+#ifdef ER_WARN_DATA_OUT_OF_RANGE
+  case ER_WARN_DATA_OUT_OF_RANGE              : return "22003";
+#endif
+#ifdef ER_WRONG_NAME_FOR_INDEX
+  case ER_WRONG_NAME_FOR_INDEX                : return "42000";
+#endif
+#ifdef ER_WRONG_NAME_FOR_CATALOG
+  case ER_WRONG_NAME_FOR_CATALOG              : return "42000";
+#endif
+#ifdef ER_UNKNOWN_STORAGE_ENGINE
+  case ER_UNKNOWN_STORAGE_ENGINE              : return "42000";
+#endif
+#ifdef ER_TRUNCATED_WRONG_VALUE
+  case ER_TRUNCATED_WRONG_VALUE               : return "22007";
+#endif
+#ifdef ER_SP_NO_RECURSIVE_CREATE
+  case ER_SP_NO_RECURSIVE_CREATE              : return "2F003";
+#endif
+#ifdef ER_SP_ALREADY_EXISTS
+  case ER_SP_ALREADY_EXISTS                   : return "42000";
+#endif
+#ifdef ER_SP_DOES_NOT_EXIST
+  case ER_SP_DOES_NOT_EXIST                   : return "42000";
+#endif
+#ifdef ER_SP_LILABEL_MISMATCH
+  case ER_SP_LILABEL_MISMATCH                 : return "42000";
+#endif
+#ifdef ER_SP_LABEL_REDEFINE
+  case ER_SP_LABEL_REDEFINE                   : return "42000";
+#endif
+#ifdef ER_SP_LABEL_MISMATCH
+  case ER_SP_LABEL_MISMATCH                   : return "42000";
+#endif
+#ifdef ER_SP_UNINIT_VAR
+  case ER_SP_UNINIT_VAR                       : return "01000";
+#endif
+#ifdef ER_SP_BADSELECT
+  case ER_SP_BADSELECT                        : return "0A000";
+#endif
+#ifdef ER_SP_BADRETURN
+  case ER_SP_BADRETURN                        : return "42000";
+#endif
+#ifdef ER_SP_BADSTATEMENT
+  case ER_SP_BADSTATEMENT                     : return "0A000";
+#endif
+#ifdef ER_UPDATE_LOG_DEPRECATED_IGNORED
+  case ER_UPDATE_LOG_DEPRECATED_IGNORED       : return "42000";
+#endif
+#ifdef ER_UPDATE_LOG_DEPRECATED_TRANSLATED
+  case ER_UPDATE_LOG_DEPRECATED_TRANSLATED    : return "42000";
+#endif
+#ifdef ER_QUERY_INTERRUPTED
+  case ER_QUERY_INTERRUPTED                   : return "70100";
+#endif
+#ifdef ER_SP_WRONG_NO_OF_ARGS
+  case ER_SP_WRONG_NO_OF_ARGS                 : return "42000";
+#endif
+#ifdef ER_SP_COND_MISMATCH
+  case ER_SP_COND_MISMATCH                    : return "42000";
+#endif
+#ifdef ER_SP_NORETURN
+  case ER_SP_NORETURN                         : return "42000";
+#endif
+#ifdef ER_SP_NORETURNEND
+  case ER_SP_NORETURNEND                      : return "2F005";
+#endif
+#ifdef ER_SP_BAD_CURSOR_QUERY
+  case ER_SP_BAD_CURSOR_QUERY                 : return "42000";
+#endif
+#ifdef ER_SP_BAD_CURSOR_SELECT
+  case ER_SP_BAD_CURSOR_SELECT                : return "42000";
+#endif
+#ifdef ER_SP_CURSOR_MISMATCH
+  case ER_SP_CURSOR_MISMATCH                  : return "42000";
+#endif
+#ifdef ER_SP_CURSOR_ALREADY_OPEN
+  case ER_SP_CURSOR_ALREADY_OPEN              : return "24000";
+#endif
+#ifdef ER_SP_CURSOR_NOT_OPEN
+  case ER_SP_CURSOR_NOT_OPEN                  : return "24000";
+#endif
+#ifdef ER_SP_UNDECLARED_VAR
+  case ER_SP_UNDECLARED_VAR                   : return "42000";
+#endif
+#ifdef ER_SP_FETCH_NO_DATA
+  case ER_SP_FETCH_NO_DATA                    : return "02000";
+#endif
+#ifdef ER_SP_DUP_PARAM
+  case ER_SP_DUP_PARAM                        : return "42000";
+#endif
+#ifdef ER_SP_DUP_VAR
+  case ER_SP_DUP_VAR                          : return "42000";
+#endif
+#ifdef ER_SP_DUP_COND
+  case ER_SP_DUP_COND                         : return "42000";
+#endif
+#ifdef ER_SP_DUP_CURS
+  case ER_SP_DUP_CURS                         : return "42000";
+#endif
+#ifdef ER_SP_SUBSELECT_NYI
+  case ER_SP_SUBSELECT_NYI                    : return "0A000";
+#endif
+#ifdef ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
+  case ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG       : return "0A000";
+#endif
+#ifdef ER_SP_VARCOND_AFTER_CURSHNDLR
+  case ER_SP_VARCOND_AFTER_CURSHNDLR          : return "42000";
+#endif
+#ifdef ER_SP_CURSOR_AFTER_HANDLER
+  case ER_SP_CURSOR_AFTER_HANDLER             : return "42000";
+#endif
+#ifdef ER_SP_CASE_NOT_FOUND
+  case ER_SP_CASE_NOT_FOUND                   : return "20000";
+#endif
+#ifdef ER_DIVISION_BY_ZERO
+  case ER_DIVISION_BY_ZERO                    : return "22012";
+#endif
+#ifdef ER_ILLEGAL_VALUE_FOR_TYPE
+  case ER_ILLEGAL_VALUE_FOR_TYPE              : return "22007";
+#endif
+#ifdef ER_PROCACCESS_DENIED_ERROR
+  case ER_PROCACCESS_DENIED_ERROR             : return "42000";
+#endif
+#ifdef ER_XAER_NOTA
+  case ER_XAER_NOTA                           : return "XAE04";
+#endif
+#ifdef ER_XAER_INVAL
+  case ER_XAER_INVAL                          : return "XAE05";
+#endif
+#ifdef ER_XAER_RMFAIL
+  case ER_XAER_RMFAIL                         : return "XAE07";
+#endif
+#ifdef ER_XAER_OUTSIDE
+  case ER_XAER_OUTSIDE                        : return "XAE09";
+#endif
+#ifdef ER_XAER_RMERR
+  case ER_XAER_RMERR                          : return "XAE03";
+#endif
+#ifdef ER_XA_RBROLLBACK
+  case ER_XA_RBROLLBACK                       : return "XA100";
+#endif
+#ifdef ER_NONEXISTING_PROC_GRANT
+  case ER_NONEXISTING_PROC_GRANT              : return "42000";
+#endif
+#ifdef ER_DATA_TOO_LONG
+  case ER_DATA_TOO_LONG                       : return "22001";
+#endif
+#ifdef ER_SP_BAD_SQLSTATE
+  case ER_SP_BAD_SQLSTATE                     : return "42000";
+#endif
+#ifdef ER_CANT_CREATE_USER_WITH_GRANT
+  case ER_CANT_CREATE_USER_WITH_GRANT         : return "42000";
+#endif
+#ifdef ER_SP_DUP_HANDLER
+  case ER_SP_DUP_HANDLER                      : return "42000";
+#endif
+#ifdef ER_SP_NOT_VAR_ARG
+  case ER_SP_NOT_VAR_ARG                      : return "42000";
+#endif
+#ifdef ER_SP_NO_RETSET
+  case ER_SP_NO_RETSET                        : return "0A000";
+#endif
+#ifdef ER_CANT_CREATE_GEOMETRY_OBJECT
+  case ER_CANT_CREATE_GEOMETRY_OBJECT         : return "22003";
+#endif
+#ifdef ER_TOO_BIG_SCALE
+  case ER_TOO_BIG_SCALE                       : return "42000";
+#endif
+#ifdef ER_TOO_BIG_PRECISION
+  case ER_TOO_BIG_PRECISION                   : return "42000";
+#endif
+#ifdef ER_M_BIGGER_THAN_D
+  case ER_M_BIGGER_THAN_D                     : return "42000";
+#endif
+#ifdef ER_TOO_LONG_BODY
+  case ER_TOO_LONG_BODY                       : return "42000";
+#endif
+#ifdef ER_TOO_BIG_DISPLAYWIDTH
+  case ER_TOO_BIG_DISPLAYWIDTH                : return "42000";
+#endif
+#ifdef ER_XAER_DUPID
+  case ER_XAER_DUPID                          : return "XAE08";
+#endif
+#ifdef ER_DATETIME_FUNCTION_OVERFLOW
+  case ER_DATETIME_FUNCTION_OVERFLOW          : return "22008";
+#endif
+#ifdef ER_ROW_IS_REFERENCED_2
+  case ER_ROW_IS_REFERENCED_2                 : return "23000";
+#endif
+#ifdef ER_NO_REFERENCED_ROW_2
+  case ER_NO_REFERENCED_ROW_2                 : return "23000";
+#endif
+#ifdef ER_SP_BAD_VAR_SHADOW
+  case ER_SP_BAD_VAR_SHADOW                   : return "42000";
+#endif
+#ifdef ER_SP_WRONG_NAME
+  case ER_SP_WRONG_NAME                       : return "42000";
+#endif
+#ifdef ER_SP_NO_AGGREGATE
+  case ER_SP_NO_AGGREGATE                     : return "42000";
+#endif
+#ifdef ER_MAX_PREPARED_STMT_COUNT_REACHED
+  case ER_MAX_PREPARED_STMT_COUNT_REACHED     : return "42000";
+#endif
+#ifdef ER_NON_GROUPING_FIELD_USED
+  case ER_NON_GROUPING_FIELD_USED             : return "42000";
+#endif
+#ifdef ER_FOREIGN_DUPLICATE_KEY
+  case ER_FOREIGN_DUPLICATE_KEY               : return "23000";
+#endif
+#ifdef ER_CANT_CHANGE_TX_ISOLATION
+  case ER_CANT_CHANGE_TX_ISOLATION            : return "25001";
+#endif
+#ifdef ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+  case ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT      : return "42000";
+#endif
+#ifdef ER_WRONG_PARAMETERS_TO_NATIVE_FCT
+  case ER_WRONG_PARAMETERS_TO_NATIVE_FCT      : return "42000";
+#endif
+#ifdef ER_WRONG_PARAMETERS_TO_STORED_FCT
+  case ER_WRONG_PARAMETERS_TO_STORED_FCT      : return "42000";
+#endif
+#ifdef ER_DUP_ENTRY_WITH_KEY_NAME
+  case ER_DUP_ENTRY_WITH_KEY_NAME             : return "23000";
+#endif
+#ifdef ER_XA_RBTIMEOUT
+  case ER_XA_RBTIMEOUT                        : return "XA106";
+#endif
+#ifdef ER_XA_RBDEADLOCK
+  case ER_XA_RBDEADLOCK                       : return "XA102";
+#endif
+#ifdef ER_FUNC_INEXISTENT_NAME_COLLISION
+  case ER_FUNC_INEXISTENT_NAME_COLLISION      : return "42000";
+#endif
+#ifdef ER_DUP_SIGNAL_SET
+  case ER_DUP_SIGNAL_SET                      : return "42000";
+#endif
+#ifdef ER_SIGNAL_WARN
+  case ER_SIGNAL_WARN                         : return "01000";
+#endif
+#ifdef ER_SIGNAL_NOT_FOUND
+  case ER_SIGNAL_NOT_FOUND                    : return "02000";
+#endif
+#ifdef ER_SIGNAL_EXCEPTION
+  case ER_SIGNAL_EXCEPTION                    : return "HY000";
+#endif
+#ifdef ER_RESIGNAL_WITHOUT_ACTIVE_HANDLER
+  case ER_RESIGNAL_WITHOUT_ACTIVE_HANDLER     : return "0K000";
+#endif
+#ifdef ER_SPATIAL_MUST_HAVE_GEOM_COL
+  case ER_SPATIAL_MUST_HAVE_GEOM_COL          : return "42000";
+#endif
+#ifdef ER_DATA_OUT_OF_RANGE
+  case ER_DATA_OUT_OF_RANGE                   : return "22003";
+#endif

Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/get_error_codes.php
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/get_error_codes.php	2011-08-31 \
                15:44:01 UTC (rev 315904)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/get_error_codes.php	2011-08-31 \
15:46:07 UTC (rev 315905) @@ -5,7 +5,7 @@
 	while (!feof(STDIN)) {
 		$line = fgets(STDIN);

-		if (ereg('^(ER_.*),[[:space:]]+"(.*)",[[:space:]]+"(.*)"', $line, $matches)) {
+		if (ereg('^\{[[:space:]]+(ER_.*)[[:space:]]+,[[:space:]]*"(.*)",[[:space:]]*"(.*)"', \
$line, $matches)) {  $codes[$matches[1]] = $matches[2];
 			$maxlen = max($maxlen, strlen($matches[1]));
 		}
@@ -24,4 +24,4 @@
 	}


-?>
\ No newline at end of file
+?>

Modified: php/php-src/branches/PHP_5_4/ext/pdo_mysql/php_pdo_mysql_sqlstate.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/php_pdo_mysql_sqlstate.h	2011-08-31 \
                15:44:01 UTC (rev 315904)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/php_pdo_mysql_sqlstate.h	2011-08-31 \
15:46:07 UTC (rev 315905) @@ -1,388 +1,646 @@
 /* DO NOT EDIT THIS FILE!!! It is auto generated by get_error_codes.php */
-#ifdef ER_DUP_KEY
-  case ER_DUP_KEY                           : return "23000";
+#ifdef ER_DUP_KEY
+  case ER_DUP_KEY                             : return "23000";
 #endif
-#ifdef ER_OUTOFMEMORY
-  case ER_OUTOFMEMORY                       : return "HY001";
+#ifdef ER_OUTOFMEMORY
+  case ER_OUTOFMEMORY                         : return "HY001";
 #endif
-#ifdef ER_OUT_OF_SORTMEMORY
-  case ER_OUT_OF_SORTMEMORY                 : return "HY001";
+#ifdef ER_OUT_OF_SORTMEMORY
+  case ER_OUT_OF_SORTMEMORY                   : return "HY001";
 #endif
-#ifdef ER_CON_COUNT_ERROR
-  case ER_CON_COUNT_ERROR                   : return "08004";
+#ifdef ER_CON_COUNT_ERROR
+  case ER_CON_COUNT_ERROR                     : return "08004";
 #endif
-#ifdef ER_BAD_HOST_ERROR
-  case ER_BAD_HOST_ERROR                    : return "08S01";
+#ifdef ER_BAD_HOST_ERROR
+  case ER_BAD_HOST_ERROR                      : return "08S01";
 #endif
-#ifdef ER_HANDSHAKE_ERROR
-  case ER_HANDSHAKE_ERROR                   : return "08S01";
+#ifdef ER_HANDSHAKE_ERROR
+  case ER_HANDSHAKE_ERROR                     : return "08S01";
 #endif
-#ifdef ER_DBACCESS_DENIED_ERROR
-  case ER_DBACCESS_DENIED_ERROR             : return "42000";
+#ifdef ER_DBACCESS_DENIED_ERROR
+  case ER_DBACCESS_DENIED_ERROR               : return "42000";
 #endif
-#ifdef ER_ACCESS_DENIED_ERROR
-  case ER_ACCESS_DENIED_ERROR               : return "28000";
+#ifdef ER_ACCESS_DENIED_ERROR
+  case ER_ACCESS_DENIED_ERROR                 : return "28000";
 #endif
-#ifdef ER_NO_DB_ERROR
-  case ER_NO_DB_ERROR                       : return "3D000";
+#ifdef ER_NO_DB_ERROR
+  case ER_NO_DB_ERROR                         : return "3D000";
 #endif
-#ifdef ER_UNKNOWN_COM_ERROR
-  case ER_UNKNOWN_COM_ERROR                 : return "08S01";
+#ifdef ER_UNKNOWN_COM_ERROR
+  case ER_UNKNOWN_COM_ERROR                   : return "08S01";
 #endif
-#ifdef ER_BAD_NULL_ERROR
-  case ER_BAD_NULL_ERROR                    : return "23000";
+#ifdef ER_BAD_NULL_ERROR
+  case ER_BAD_NULL_ERROR                      : return "23000";
 #endif
-#ifdef ER_BAD_DB_ERROR
-  case ER_BAD_DB_ERROR                      : return "42000";
+#ifdef ER_BAD_DB_ERROR
+  case ER_BAD_DB_ERROR                        : return "42000";
 #endif
-#ifdef ER_TABLE_EXISTS_ERROR
-  case ER_TABLE_EXISTS_ERROR                : return "42S01";
+#ifdef ER_TABLE_EXISTS_ERROR
+  case ER_TABLE_EXISTS_ERROR                  : return "42S01";
 #endif
-#ifdef ER_BAD_TABLE_ERROR
-  case ER_BAD_TABLE_ERROR                   : return "42S02";
+#ifdef ER_BAD_TABLE_ERROR
+  case ER_BAD_TABLE_ERROR                     : return "42S02";
 #endif
-#ifdef ER_NON_UNIQ_ERROR
-  case ER_NON_UNIQ_ERROR                    : return "23000";
+#ifdef ER_NON_UNIQ_ERROR
+  case ER_NON_UNIQ_ERROR                      : return "23000";
 #endif
-#ifdef ER_SERVER_SHUTDOWN
-  case ER_SERVER_SHUTDOWN                   : return "08S01";
+#ifdef ER_SERVER_SHUTDOWN
+  case ER_SERVER_SHUTDOWN                     : return "08S01";
 #endif
-#ifdef ER_BAD_FIELD_ERROR
-  case ER_BAD_FIELD_ERROR                   : return "42S22";
+#ifdef ER_BAD_FIELD_ERROR
+  case ER_BAD_FIELD_ERROR                     : return "42S22";
 #endif
-#ifdef ER_WRONG_FIELD_WITH_GROUP
-  case ER_WRONG_FIELD_WITH_GROUP            : return "42000";
+#ifdef ER_WRONG_FIELD_WITH_GROUP
+  case ER_WRONG_FIELD_WITH_GROUP              : return "42000";
 #endif
-#ifdef ER_WRONG_GROUP_FIELD
-  case ER_WRONG_GROUP_FIELD                 : return "42000";
+#ifdef ER_WRONG_GROUP_FIELD
+  case ER_WRONG_GROUP_FIELD                   : return "42000";
 #endif
-#ifdef ER_WRONG_SUM_SELECT
-  case ER_WRONG_SUM_SELECT                  : return "42000";
+#ifdef ER_WRONG_SUM_SELECT
+  case ER_WRONG_SUM_SELECT                    : return "42000";
 #endif
-#ifdef ER_WRONG_VALUE_COUNT
-  case ER_WRONG_VALUE_COUNT                 : return "21S01";
+#ifdef ER_WRONG_VALUE_COUNT
+  case ER_WRONG_VALUE_COUNT                   : return "21S01";
 #endif
-#ifdef ER_TOO_LONG_IDENT
-  case ER_TOO_LONG_IDENT                    : return "42000";
+#ifdef ER_TOO_LONG_IDENT
+  case ER_TOO_LONG_IDENT                      : return "42000";
 #endif
-#ifdef ER_DUP_FIELDNAME
-  case ER_DUP_FIELDNAME                     : return "42S21";
+#ifdef ER_DUP_FIELDNAME
+  case ER_DUP_FIELDNAME                       : return "42S21";
 #endif
-#ifdef ER_DUP_KEYNAME
-  case ER_DUP_KEYNAME                       : return "42000";
+#ifdef ER_DUP_KEYNAME
+  case ER_DUP_KEYNAME                         : return "42000";
 #endif
-#ifdef ER_DUP_ENTRY
-  case ER_DUP_ENTRY                         : return "23000";
+#ifdef ER_DUP_ENTRY
+  case ER_DUP_ENTRY                           : return "23000";
 #endif
-#ifdef ER_WRONG_FIELD_SPEC
-  case ER_WRONG_FIELD_SPEC                  : return "42000";
+#ifdef ER_WRONG_FIELD_SPEC
+  case ER_WRONG_FIELD_SPEC                    : return "42000";
 #endif
-#ifdef ER_PARSE_ERROR
-  case ER_PARSE_ERROR                       : return "42000";
+#ifdef ER_PARSE_ERROR
+  case ER_PARSE_ERROR                         : return "42000";
 #endif
-#ifdef ER_NONUNIQ_TABLE
-  case ER_NONUNIQ_TABLE                     : return "42000";
+#ifdef ER_EMPTY_QUERY
+  case ER_EMPTY_QUERY                         : return "42000";
 #endif
-#ifdef ER_INVALID_DEFAULT
-  case ER_INVALID_DEFAULT                   : return "42000";
+#ifdef ER_NONUNIQ_TABLE
+  case ER_NONUNIQ_TABLE                       : return "42000";
 #endif
-#ifdef ER_MULTIPLE_PRI_KEY
-  case ER_MULTIPLE_PRI_KEY                  : return "42000";
+#ifdef ER_INVALID_DEFAULT
+  case ER_INVALID_DEFAULT                     : return "42000";
 #endif
-#ifdef ER_TOO_MANY_KEYS
-  case ER_TOO_MANY_KEYS                     : return "42000";
+#ifdef ER_MULTIPLE_PRI_KEY
+  case ER_MULTIPLE_PRI_KEY                    : return "42000";
 #endif
-#ifdef ER_TOO_MANY_KEY_PARTS
-  case ER_TOO_MANY_KEY_PARTS                : return "42000";
+#ifdef ER_TOO_MANY_KEYS
+  case ER_TOO_MANY_KEYS                       : return "42000";
 #endif
-#ifdef ER_TOO_LONG_KEY
-  case ER_TOO_LONG_KEY                      : return "42000";
+#ifdef ER_TOO_MANY_KEY_PARTS
+  case ER_TOO_MANY_KEY_PARTS                  : return "42000";
 #endif
-#ifdef ER_KEY_COLUMN_DOES_NOT_EXITS
-  case ER_KEY_COLUMN_DOES_NOT_EXITS         : return "42000";
+#ifdef ER_TOO_LONG_KEY
+  case ER_TOO_LONG_KEY                        : return "42000";
 #endif
-#ifdef ER_BLOB_USED_AS_KEY
-  case ER_BLOB_USED_AS_KEY                  : return "42000";
+#ifdef ER_KEY_COLUMN_DOES_NOT_EXITS
+  case ER_KEY_COLUMN_DOES_NOT_EXITS           : return "42000";
 #endif
-#ifdef ER_TOO_BIG_FIELDLENGTH
-  case ER_TOO_BIG_FIELDLENGTH               : return "42000";
+#ifdef ER_BLOB_USED_AS_KEY
+  case ER_BLOB_USED_AS_KEY                    : return "42000";
 #endif
-#ifdef ER_WRONG_AUTO_KEY
-  case ER_WRONG_AUTO_KEY                    : return "42000";
+#ifdef ER_TOO_BIG_FIELDLENGTH
+  case ER_TOO_BIG_FIELDLENGTH                 : return "42000";
 #endif
-#ifdef ER_FORCING_CLOSE
-  case ER_FORCING_CLOSE                     : return "08S01";
+#ifdef ER_WRONG_AUTO_KEY
+  case ER_WRONG_AUTO_KEY                      : return "42000";
 #endif
-#ifdef ER_IPSOCK_ERROR
-  case ER_IPSOCK_ERROR                      : return "08S01";
+#ifdef ER_FORCING_CLOSE
+  case ER_FORCING_CLOSE                       : return "08S01";
 #endif
-#ifdef ER_NO_SUCH_INDEX
-  case ER_NO_SUCH_INDEX                     : return "42S12";
+#ifdef ER_IPSOCK_ERROR
+  case ER_IPSOCK_ERROR                        : return "08S01";
 #endif
-#ifdef ER_WRONG_FIELD_TERMINATORS
-  case ER_WRONG_FIELD_TERMINATORS           : return "42000";
+#ifdef ER_NO_SUCH_INDEX
+  case ER_NO_SUCH_INDEX                       : return "42S12";
 #endif
-#ifdef ER_BLOBS_AND_NO_TERMINATED
-  case ER_BLOBS_AND_NO_TERMINATED           : return "42000";
+#ifdef ER_WRONG_FIELD_TERMINATORS
+  case ER_WRONG_FIELD_TERMINATORS             : return "42000";
 #endif
-#ifdef ER_CANT_REMOVE_ALL_FIELDS
-  case ER_CANT_REMOVE_ALL_FIELDS            : return "42000";
+#ifdef ER_BLOBS_AND_NO_TERMINATED
+  case ER_BLOBS_AND_NO_TERMINATED             : return "42000";
 #endif
-#ifdef ER_CANT_DROP_FIELD_OR_KEY
-  case ER_CANT_DROP_FIELD_OR_KEY            : return "42000";
+#ifdef ER_CANT_REMOVE_ALL_FIELDS
+  case ER_CANT_REMOVE_ALL_FIELDS              : return "42000";
 #endif
-#ifdef ER_BLOB_CANT_HAVE_DEFAULT
-  case ER_BLOB_CANT_HAVE_DEFAULT            : return "42000";
+#ifdef ER_CANT_DROP_FIELD_OR_KEY
+  case ER_CANT_DROP_FIELD_OR_KEY              : return "42000";
 #endif
-#ifdef ER_WRONG_DB_NAME
-  case ER_WRONG_DB_NAME                     : return "42000";
+#ifdef ER_BLOB_CANT_HAVE_DEFAULT
+  case ER_BLOB_CANT_HAVE_DEFAULT              : return "42000";
 #endif
-#ifdef ER_WRONG_TABLE_NAME
-  case ER_WRONG_TABLE_NAME                  : return "42000";
+#ifdef ER_WRONG_DB_NAME
+  case ER_WRONG_DB_NAME                       : return "42000";
 #endif
-#ifdef ER_TOO_BIG_SELECT
-  case ER_TOO_BIG_SELECT                    : return "42000";
+#ifdef ER_WRONG_TABLE_NAME
+  case ER_WRONG_TABLE_NAME                    : return "42000";
 #endif
-#ifdef ER_UNKNOWN_PROCEDURE
-  case ER_UNKNOWN_PROCEDURE                 : return "42000";
+#ifdef ER_TOO_BIG_SELECT
+  case ER_TOO_BIG_SELECT                      : return "42000";
 #endif
-#ifdef ER_WRONG_PARAMCOUNT_TO_PROCEDURE
-  case ER_WRONG_PARAMCOUNT_TO_PROCEDURE     : return "42000";
+#ifdef ER_UNKNOWN_PROCEDURE
+  case ER_UNKNOWN_PROCEDURE                   : return "42000";
 #endif
-#ifdef ER_UNKNOWN_TABLE
-  case ER_UNKNOWN_TABLE                     : return "42S02";
+#ifdef ER_WRONG_PARAMCOUNT_TO_PROCEDURE
+  case ER_WRONG_PARAMCOUNT_TO_PROCEDURE       : return "42000";
 #endif
-#ifdef ER_FIELD_SPECIFIED_TWICE
-  case ER_FIELD_SPECIFIED_TWICE             : return "42000";
+#ifdef ER_UNKNOWN_TABLE
+  case ER_UNKNOWN_TABLE                       : return "42S02";
 #endif
-#ifdef ER_UNSUPPORTED_EXTENSION
-  case ER_UNSUPPORTED_EXTENSION             : return "42000";
+#ifdef ER_FIELD_SPECIFIED_TWICE
+  case ER_FIELD_SPECIFIED_TWICE               : return "42000";
 #endif
-#ifdef ER_TABLE_MUST_HAVE_COLUMNS
-  case ER_TABLE_MUST_HAVE_COLUMNS           : return "42000";
+#ifdef ER_UNSUPPORTED_EXTENSION
+  case ER_UNSUPPORTED_EXTENSION               : return "42000";
 #endif
-#ifdef ER_UNKNOWN_CHARACTER_SET
-  case ER_UNKNOWN_CHARACTER_SET             : return "42000";
+#ifdef ER_TABLE_MUST_HAVE_COLUMNS
+  case ER_TABLE_MUST_HAVE_COLUMNS             : return "42000";
 #endif
-#ifdef ER_TOO_BIG_ROWSIZE
-  case ER_TOO_BIG_ROWSIZE                   : return "42000";
+#ifdef ER_UNKNOWN_CHARACTER_SET
+  case ER_UNKNOWN_CHARACTER_SET               : return "42000";
 #endif
-#ifdef ER_WRONG_OUTER_JOIN
-  case ER_WRONG_OUTER_JOIN                  : return "42000";
+#ifdef ER_TOO_BIG_ROWSIZE
+  case ER_TOO_BIG_ROWSIZE                     : return "42000";
 #endif
-#ifdef ER_NULL_COLUMN_IN_INDEX
-  case ER_NULL_COLUMN_IN_INDEX              : return "42000";
+#ifdef ER_WRONG_OUTER_JOIN
+  case ER_WRONG_OUTER_JOIN                    : return "42000";
 #endif
-#ifdef ER_PASSWORD_ANONYMOUS_USER
-  case ER_PASSWORD_ANONYMOUS_USER           : return "42000";
+#ifdef ER_NULL_COLUMN_IN_INDEX
+  case ER_NULL_COLUMN_IN_INDEX                : return "42000";
 #endif
-#ifdef ER_PASSWORD_NOT_ALLOWED
-  case ER_PASSWORD_NOT_ALLOWED              : return "42000";
+#ifdef ER_PASSWORD_ANONYMOUS_USER
+  case ER_PASSWORD_ANONYMOUS_USER             : return "42000";
 #endif
-#ifdef ER_PASSWORD_NO_MATCH
-  case ER_PASSWORD_NO_MATCH                 : return "42000";
+#ifdef ER_PASSWORD_NOT_ALLOWED
+  case ER_PASSWORD_NOT_ALLOWED                : return "42000";
 #endif
-#ifdef ER_WRONG_VALUE_COUNT_ON_ROW
-  case ER_WRONG_VALUE_COUNT_ON_ROW          : return "21S01";
+#ifdef ER_PASSWORD_NO_MATCH
+  case ER_PASSWORD_NO_MATCH                   : return "42000";
 #endif
-#ifdef ER_INVALID_USE_OF_NULL
-  case ER_INVALID_USE_OF_NULL               : return "42000";
+#ifdef ER_WRONG_VALUE_COUNT_ON_ROW
+  case ER_WRONG_VALUE_COUNT_ON_ROW            : return "21S01";
 #endif
-#ifdef ER_REGEXP_ERROR
-  case ER_REGEXP_ERROR                      : return "42000";
+#ifdef ER_INVALID_USE_OF_NULL
+  case ER_INVALID_USE_OF_NULL                 : return "22004";
 #endif
-#ifdef ER_NONEXISTING_GRANT
-  case ER_NONEXISTING_GRANT                 : return "42000";
+#ifdef ER_REGEXP_ERROR
+  case ER_REGEXP_ERROR                        : return "42000";
 #endif
-#ifdef ER_TABLEACCESS_DENIED_ERROR
-  case ER_TABLEACCESS_DENIED_ERROR          : return "42000";
+#ifdef ER_MIX_OF_GROUP_FUNC_AND_FIELDS
+  case ER_MIX_OF_GROUP_FUNC_AND_FIELDS        : return "42000";
 #endif
-#ifdef ER_COLUMNACCESS_DENIED_ERROR
-  case ER_COLUMNACCESS_DENIED_ERROR         : return "42000";
+#ifdef ER_NONEXISTING_GRANT
+  case ER_NONEXISTING_GRANT                   : return "42000";
 #endif
-#ifdef ER_ILLEGAL_GRANT_FOR_TABLE
-  case ER_ILLEGAL_GRANT_FOR_TABLE           : return "42000";
+#ifdef ER_TABLEACCESS_DENIED_ERROR
+  case ER_TABLEACCESS_DENIED_ERROR            : return "42000";
 #endif
-#ifdef ER_GRANT_WRONG_HOST_OR_USER
-  case ER_GRANT_WRONG_HOST_OR_USER          : return "42000";
+#ifdef ER_COLUMNACCESS_DENIED_ERROR
+  case ER_COLUMNACCESS_DENIED_ERROR           : return "42000";
 #endif
-#ifdef ER_NO_SUCH_TABLE
-  case ER_NO_SUCH_TABLE                     : return "42S02";
+#ifdef ER_ILLEGAL_GRANT_FOR_TABLE
+  case ER_ILLEGAL_GRANT_FOR_TABLE             : return "42000";
 #endif
-#ifdef ER_NONEXISTING_TABLE_GRANT
-  case ER_NONEXISTING_TABLE_GRANT           : return "42000";
+#ifdef ER_GRANT_WRONG_HOST_OR_USER
+  case ER_GRANT_WRONG_HOST_OR_USER            : return "42000";
 #endif
-#ifdef ER_NOT_ALLOWED_COMMAND
-  case ER_NOT_ALLOWED_COMMAND               : return "42000";
+#ifdef ER_NO_SUCH_TABLE
+  case ER_NO_SUCH_TABLE                       : return "42S02";
 #endif
-#ifdef ER_SYNTAX_ERROR
-  case ER_SYNTAX_ERROR                      : return "42000";
+#ifdef ER_NONEXISTING_TABLE_GRANT
+  case ER_NONEXISTING_TABLE_GRANT             : return "42000";
 #endif
-#ifdef ER_ABORTING_CONNECTION
-  case ER_ABORTING_CONNECTION               : return "08S01";
+#ifdef ER_NOT_ALLOWED_COMMAND
+  case ER_NOT_ALLOWED_COMMAND                 : return "42000";
 #endif
-#ifdef ER_NET_PACKET_TOO_LARGE
-  case ER_NET_PACKET_TOO_LARGE              : return "08S01";
+#ifdef ER_SYNTAX_ERROR
+  case ER_SYNTAX_ERROR                        : return "42000";
 #endif
-#ifdef ER_NET_READ_ERROR_FROM_PIPE
-  case ER_NET_READ_ERROR_FROM_PIPE          : return "08S01";
+#ifdef ER_ABORTING_CONNECTION
+  case ER_ABORTING_CONNECTION                 : return "08S01";
 #endif
-#ifdef ER_NET_FCNTL_ERROR
-  case ER_NET_FCNTL_ERROR                   : return "08S01";
+#ifdef ER_NET_PACKET_TOO_LARGE
+  case ER_NET_PACKET_TOO_LARGE                : return "08S01";
 #endif
-#ifdef ER_NET_PACKETS_OUT_OF_ORDER
-  case ER_NET_PACKETS_OUT_OF_ORDER          : return "08S01";
+#ifdef ER_NET_READ_ERROR_FROM_PIPE
+  case ER_NET_READ_ERROR_FROM_PIPE            : return "08S01";
 #endif
-#ifdef ER_NET_UNCOMPRESS_ERROR
-  case ER_NET_UNCOMPRESS_ERROR              : return "08S01";
+#ifdef ER_NET_FCNTL_ERROR
+  case ER_NET_FCNTL_ERROR                     : return "08S01";
 #endif
-#ifdef ER_NET_READ_ERROR
-  case ER_NET_READ_ERROR                    : return "08S01";
+#ifdef ER_NET_PACKETS_OUT_OF_ORDER
+  case ER_NET_PACKETS_OUT_OF_ORDER            : return "08S01";
 #endif
-#ifdef ER_NET_READ_INTERRUPTED
-  case ER_NET_READ_INTERRUPTED              : return "08S01";
+#ifdef ER_NET_UNCOMPRESS_ERROR
+  case ER_NET_UNCOMPRESS_ERROR                : return "08S01";
 #endif
-#ifdef ER_NET_ERROR_ON_WRITE
-  case ER_NET_ERROR_ON_WRITE                : return "08S01";
+#ifdef ER_NET_READ_ERROR
+  case ER_NET_READ_ERROR                      : return "08S01";
 #endif
-#ifdef ER_NET_WRITE_INTERRUPTED
-  case ER_NET_WRITE_INTERRUPTED             : return "08S01";
+#ifdef ER_NET_READ_INTERRUPTED
+  case ER_NET_READ_INTERRUPTED                : return "08S01";
 #endif
-#ifdef ER_TOO_LONG_STRING
-  case ER_TOO_LONG_STRING                   : return "42000";
+#ifdef ER_NET_ERROR_ON_WRITE
+  case ER_NET_ERROR_ON_WRITE                  : return "08S01";
 #endif
-#ifdef ER_TABLE_CANT_HANDLE_BLOB
-  case ER_TABLE_CANT_HANDLE_BLOB            : return "42000";
+#ifdef ER_NET_WRITE_INTERRUPTED
+  case ER_NET_WRITE_INTERRUPTED               : return "08S01";
 #endif
-#ifdef ER_TABLE_CANT_HANDLE_AUTO_INCREMENT
-  case ER_TABLE_CANT_HANDLE_AUTO_INCREMENT  : return "42000";
+#ifdef ER_TOO_LONG_STRING
+  case ER_TOO_LONG_STRING                     : return "42000";
 #endif
-#ifdef ER_WRONG_COLUMN_NAME
-  case ER_WRONG_COLUMN_NAME                 : return "42000";
+#ifdef ER_TABLE_CANT_HANDLE_BLOB
+  case ER_TABLE_CANT_HANDLE_BLOB              : return "42000";
 #endif
-#ifdef ER_WRONG_KEY_COLUMN
-  case ER_WRONG_KEY_COLUMN                  : return "42000";
+#ifdef ER_TABLE_CANT_HANDLE_AUTO_INCREMENT
+  case ER_TABLE_CANT_HANDLE_AUTO_INCREMENT    : return "42000";
 #endif
-#ifdef ER_DUP_UNIQUE
-  case ER_DUP_UNIQUE                        : return "23000";
+#ifdef ER_WRONG_COLUMN_NAME
+  case ER_WRONG_COLUMN_NAME                   : return "42000";
 #endif
-#ifdef ER_BLOB_KEY_WITHOUT_LENGTH
-  case ER_BLOB_KEY_WITHOUT_LENGTH           : return "42000";
+#ifdef ER_WRONG_KEY_COLUMN
+  case ER_WRONG_KEY_COLUMN                    : return "42000";
 #endif
-#ifdef ER_PRIMARY_CANT_HAVE_NULL
-  case ER_PRIMARY_CANT_HAVE_NULL            : return "42000";
+#ifdef ER_DUP_UNIQUE
+  case ER_DUP_UNIQUE                          : return "23000";
 #endif
-#ifdef ER_TOO_MANY_ROWS
-  case ER_TOO_MANY_ROWS                     : return "42000";
+#ifdef ER_BLOB_KEY_WITHOUT_LENGTH
+  case ER_BLOB_KEY_WITHOUT_LENGTH             : return "42000";
 #endif
-#ifdef ER_REQUIRES_PRIMARY_KEY
-  case ER_REQUIRES_PRIMARY_KEY              : return "42000";
+#ifdef ER_PRIMARY_CANT_HAVE_NULL
+  case ER_PRIMARY_CANT_HAVE_NULL              : return "42000";
 #endif
-#ifdef ER_CHECK_NO_SUCH_TABLE
-  case ER_CHECK_NO_SUCH_TABLE               : return "42000";
+#ifdef ER_TOO_MANY_ROWS
+  case ER_TOO_MANY_ROWS                       : return "42000";
 #endif
-#ifdef ER_CHECK_NOT_IMPLEMENTED
-  case ER_CHECK_NOT_IMPLEMENTED             : return "42000";
+#ifdef ER_REQUIRES_PRIMARY_KEY
+  case ER_REQUIRES_PRIMARY_KEY                : return "42000";
 #endif
-#ifdef ER_CANT_DO_THIS_DURING_AN_TRANSACTION
-  case ER_CANT_DO_THIS_DURING_AN_TRANSACTION: return "25000";
+#ifdef ER_KEY_DOES_NOT_EXITS
+  case ER_KEY_DOES_NOT_EXITS                  : return "42000";
 #endif
-#ifdef ER_NEW_ABORTING_CONNECTION
-  case ER_NEW_ABORTING_CONNECTION           : return "08S01";
+#ifdef ER_CHECK_NO_SUCH_TABLE
+  case ER_CHECK_NO_SUCH_TABLE                 : return "42000";
 #endif
-#ifdef ER_MASTER_NET_READ
-  case ER_MASTER_NET_READ                   : return "08S01";
+#ifdef ER_CHECK_NOT_IMPLEMENTED
+  case ER_CHECK_NOT_IMPLEMENTED               : return "42000";
 #endif
-#ifdef ER_MASTER_NET_WRITE
-  case ER_MASTER_NET_WRITE                  : return "08S01";
+#ifdef ER_CANT_DO_THIS_DURING_AN_TRANSACTION
+  case ER_CANT_DO_THIS_DURING_AN_TRANSACTION  : return "25000";
 #endif
-#ifdef ER_TOO_MANY_USER_CONNECTIONS
-  case ER_TOO_MANY_USER_CONNECTIONS         : return "42000";
+#ifdef ER_NEW_ABORTING_CONNECTION
+  case ER_NEW_ABORTING_CONNECTION             : return "08S01";
 #endif
-#ifdef ER_READ_ONLY_TRANSACTION
-  case ER_READ_ONLY_TRANSACTION             : return "25000";
+#ifdef ER_MASTER_NET_READ
+  case ER_MASTER_NET_READ                     : return "08S01";
 #endif
-#ifdef ER_LOCK_DEADLOCK
-  case ER_LOCK_DEADLOCK                     : return "40001";
+#ifdef ER_MASTER_NET_WRITE
+  case ER_MASTER_NET_WRITE                    : return "08S01";
 #endif
-#ifdef ER_NO_REFERENCED_ROW
-  case ER_NO_REFERENCED_ROW                 : return "23000";
+#ifdef ER_TOO_MANY_USER_CONNECTIONS
+  case ER_TOO_MANY_USER_CONNECTIONS           : return "42000";
 #endif
-#ifdef ER_ROW_IS_REFERENCED
-  case ER_ROW_IS_REFERENCED                 : return "23000";
+#ifdef ER_READ_ONLY_TRANSACTION
+  case ER_READ_ONLY_TRANSACTION               : return "25000";
 #endif
-#ifdef ER_CONNECT_TO_MASTER
-  case ER_CONNECT_TO_MASTER                 : return "08S01";
+#ifdef ER_NO_PERMISSION_TO_CREATE_USER
+  case ER_NO_PERMISSION_TO_CREATE_USER        : return "42000";
 #endif
-#ifdef ER_USER_LIMIT_REACHED
-  case ER_USER_LIMIT_REACHED                : return "42000";
+#ifdef ER_LOCK_DEADLOCK
+  case ER_LOCK_DEADLOCK                       : return "40001";
 #endif
-#ifdef ER_NO_DEFAULT
-  case ER_NO_DEFAULT                        : return "42000";
+#ifdef ER_NO_REFERENCED_ROW
+  case ER_NO_REFERENCED_ROW                   : return "23000";
 #endif
-#ifdef ER_WRONG_VALUE_FOR_VAR
-  case ER_WRONG_VALUE_FOR_VAR               : return "42000";
+#ifdef ER_ROW_IS_REFERENCED
+  case ER_ROW_IS_REFERENCED                   : return "23000";
 #endif
-#ifdef ER_WRONG_TYPE_FOR_VAR
-  case ER_WRONG_TYPE_FOR_VAR                : return "42000";
+#ifdef ER_CONNECT_TO_MASTER
+  case ER_CONNECT_TO_MASTER                   : return "08S01";
 #endif
-#ifdef ER_CANT_USE_OPTION_HERE
-  case ER_CANT_USE_OPTION_HERE              : return "42000";
+#ifdef ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT
+  case ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT   : return "21000";
 #endif
-#ifdef ER_NOT_SUPPORTED_YET
-  case ER_NOT_SUPPORTED_YET                 : return "42000";
+#ifdef ER_USER_LIMIT_REACHED
+  case ER_USER_LIMIT_REACHED                  : return "42000";
 #endif
-#ifdef ER_WRONG_FK_DEF
-  case ER_WRONG_FK_DEF                      : return "42000";
+#ifdef ER_SPECIFIC_ACCESS_DENIED_ERROR
+  case ER_SPECIFIC_ACCESS_DENIED_ERROR        : return "42000";
 #endif
-#ifdef ER_OPERAND_COLUMNS
-  case ER_OPERAND_COLUMNS                   : return "21000";
+#ifdef ER_NO_DEFAULT
+  case ER_NO_DEFAULT                          : return "42000";
 #endif
-#ifdef ER_SUBQUERY_NO_1_ROW
-  case ER_SUBQUERY_NO_1_ROW                 : return "21000";
+#ifdef ER_WRONG_VALUE_FOR_VAR
+  case ER_WRONG_VALUE_FOR_VAR                 : return "42000";
 #endif
-#ifdef ER_ILLEGAL_REFERENCE
-  case ER_ILLEGAL_REFERENCE                 : return "42S22";
+#ifdef ER_WRONG_TYPE_FOR_VAR
+  case ER_WRONG_TYPE_FOR_VAR                  : return "42000";
 #endif
-#ifdef ER_DERIVED_MUST_HAVE_ALIAS
-  case ER_DERIVED_MUST_HAVE_ALIAS           : return "42000";
+#ifdef ER_CANT_USE_OPTION_HERE
+  case ER_CANT_USE_OPTION_HERE                : return "42000";
 #endif
-#ifdef ER_SELECT_REDUCED
-  case ER_SELECT_REDUCED                    : return "01000";
+#ifdef ER_NOT_SUPPORTED_YET
+  case ER_NOT_SUPPORTED_YET                   : return "42000";
 #endif
-#ifdef ER_TABLENAME_NOT_ALLOWED_HERE
-  case ER_TABLENAME_NOT_ALLOWED_HERE        : return "42000";
+#ifdef ER_WRONG_FK_DEF
+  case ER_WRONG_FK_DEF                        : return "42000";
 #endif
-#ifdef ER_NOT_SUPPORTED_AUTH_MODE
-  case ER_NOT_SUPPORTED_AUTH_MODE           : return "08004";
+#ifdef ER_OPERAND_COLUMNS
+  case ER_OPERAND_COLUMNS                     : return "21000";
 #endif
-#ifdef ER_SPATIAL_CANT_HAVE_NULL
-  case ER_SPATIAL_CANT_HAVE_NULL            : return "42000";
+#ifdef ER_SUBQUERY_NO_1_ROW
+  case ER_SUBQUERY_NO_1_ROW                   : return "21000";
 #endif
-#ifdef ER_COLLATION_CHARSET_MISMATCH
-  case ER_COLLATION_CHARSET_MISMATCH        : return "42000";
+#ifdef ER_ILLEGAL_REFERENCE
+  case ER_ILLEGAL_REFERENCE                   : return "42S22";
 #endif
-#ifdef ER_WARN_TOO_FEW_RECORDS
-  case ER_WARN_TOO_FEW_RECORDS              : return "01000";
+#ifdef ER_DERIVED_MUST_HAVE_ALIAS
+  case ER_DERIVED_MUST_HAVE_ALIAS             : return "42000";
 #endif
-#ifdef ER_WARN_TOO_MANY_RECORDS
-  case ER_WARN_TOO_MANY_RECORDS             : return "01000";
+#ifdef ER_SELECT_REDUCED
+  case ER_SELECT_REDUCED                      : return "01000";
 #endif
-#ifdef ER_WARN_NULL_TO_NOTNULL
-  case ER_WARN_NULL_TO_NOTNULL              : return "01000";
+#ifdef ER_TABLENAME_NOT_ALLOWED_HERE
+  case ER_TABLENAME_NOT_ALLOWED_HERE          : return "42000";
 #endif
-#ifdef ER_WARN_DATA_OUT_OF_RANGE
-  case ER_WARN_DATA_OUT_OF_RANGE            : return "01000";
+#ifdef ER_NOT_SUPPORTED_AUTH_MODE
+  case ER_NOT_SUPPORTED_AUTH_MODE             : return "08004";
 #endif
-#ifdef ER_WARN_DATA_TRUNCATED
-  case ER_WARN_DATA_TRUNCATED               : return "01000";
+#ifdef ER_SPATIAL_CANT_HAVE_NULL
+  case ER_SPATIAL_CANT_HAVE_NULL              : return "42000";
 #endif
-#ifdef ER_WRONG_NAME_FOR_INDEX
-  case ER_WRONG_NAME_FOR_INDEX              : return "42000";
+#ifdef ER_COLLATION_CHARSET_MISMATCH
+  case ER_COLLATION_CHARSET_MISMATCH          : return "42000";
 #endif
-#ifdef ER_WRONG_NAME_FOR_CATALOG
-  case ER_WRONG_NAME_FOR_CATALOG            : return "42000";
+#ifdef ER_WARN_TOO_FEW_RECORDS
+  case ER_WARN_TOO_FEW_RECORDS                : return "01000";
 #endif
-#ifdef ER_UNKNOWN_STORAGE_ENGINE
-  case ER_UNKNOWN_STORAGE_ENGINE            : return "42000";
+#ifdef ER_WARN_TOO_MANY_RECORDS
+  case ER_WARN_TOO_MANY_RECORDS               : return "01000";
 #endif
+#ifdef ER_WARN_NULL_TO_NOTNULL
+  case ER_WARN_NULL_TO_NOTNULL                : return "22004";
+#endif
+#ifdef ER_WARN_DATA_OUT_OF_RANGE
+  case ER_WARN_DATA_OUT_OF_RANGE              : return "22003";
+#endif
+#ifdef ER_WRONG_NAME_FOR_INDEX
+  case ER_WRONG_NAME_FOR_INDEX                : return "42000";
+#endif
+#ifdef ER_WRONG_NAME_FOR_CATALOG
+  case ER_WRONG_NAME_FOR_CATALOG              : return "42000";
+#endif
+#ifdef ER_UNKNOWN_STORAGE_ENGINE
+  case ER_UNKNOWN_STORAGE_ENGINE              : return "42000";
+#endif
+#ifdef ER_TRUNCATED_WRONG_VALUE
+  case ER_TRUNCATED_WRONG_VALUE               : return "22007";
+#endif
+#ifdef ER_SP_NO_RECURSIVE_CREATE
+  case ER_SP_NO_RECURSIVE_CREATE              : return "2F003";
+#endif
+#ifdef ER_SP_ALREADY_EXISTS
+  case ER_SP_ALREADY_EXISTS                   : return "42000";
+#endif
+#ifdef ER_SP_DOES_NOT_EXIST
+  case ER_SP_DOES_NOT_EXIST                   : return "42000";
+#endif
+#ifdef ER_SP_LILABEL_MISMATCH
+  case ER_SP_LILABEL_MISMATCH                 : return "42000";
+#endif
+#ifdef ER_SP_LABEL_REDEFINE
+  case ER_SP_LABEL_REDEFINE                   : return "42000";
+#endif
+#ifdef ER_SP_LABEL_MISMATCH
+  case ER_SP_LABEL_MISMATCH                   : return "42000";
+#endif
+#ifdef ER_SP_UNINIT_VAR
+  case ER_SP_UNINIT_VAR                       : return "01000";
+#endif
+#ifdef ER_SP_BADSELECT
+  case ER_SP_BADSELECT                        : return "0A000";
+#endif
+#ifdef ER_SP_BADRETURN
+  case ER_SP_BADRETURN                        : return "42000";
+#endif
+#ifdef ER_SP_BADSTATEMENT
+  case ER_SP_BADSTATEMENT                     : return "0A000";
+#endif
+#ifdef ER_UPDATE_LOG_DEPRECATED_IGNORED
+  case ER_UPDATE_LOG_DEPRECATED_IGNORED       : return "42000";
+#endif
+#ifdef ER_UPDATE_LOG_DEPRECATED_TRANSLATED
+  case ER_UPDATE_LOG_DEPRECATED_TRANSLATED    : return "42000";
+#endif
+#ifdef ER_QUERY_INTERRUPTED
+  case ER_QUERY_INTERRUPTED                   : return "70100";
+#endif
+#ifdef ER_SP_WRONG_NO_OF_ARGS
+  case ER_SP_WRONG_NO_OF_ARGS                 : return "42000";
+#endif
+#ifdef ER_SP_COND_MISMATCH
+  case ER_SP_COND_MISMATCH                    : return "42000";
+#endif
+#ifdef ER_SP_NORETURN
+  case ER_SP_NORETURN                         : return "42000";
+#endif
+#ifdef ER_SP_NORETURNEND
+  case ER_SP_NORETURNEND                      : return "2F005";
+#endif
+#ifdef ER_SP_BAD_CURSOR_QUERY
+  case ER_SP_BAD_CURSOR_QUERY                 : return "42000";
+#endif
+#ifdef ER_SP_BAD_CURSOR_SELECT
+  case ER_SP_BAD_CURSOR_SELECT                : return "42000";
+#endif
+#ifdef ER_SP_CURSOR_MISMATCH
+  case ER_SP_CURSOR_MISMATCH                  : return "42000";
+#endif
+#ifdef ER_SP_CURSOR_ALREADY_OPEN
+  case ER_SP_CURSOR_ALREADY_OPEN              : return "24000";
+#endif
+#ifdef ER_SP_CURSOR_NOT_OPEN
+  case ER_SP_CURSOR_NOT_OPEN                  : return "24000";
+#endif
+#ifdef ER_SP_UNDECLARED_VAR
+  case ER_SP_UNDECLARED_VAR                   : return "42000";
+#endif
+#ifdef ER_SP_FETCH_NO_DATA
+  case ER_SP_FETCH_NO_DATA                    : return "02000";
+#endif
+#ifdef ER_SP_DUP_PARAM
+  case ER_SP_DUP_PARAM                        : return "42000";
+#endif
+#ifdef ER_SP_DUP_VAR
+  case ER_SP_DUP_VAR                          : return "42000";
+#endif
+#ifdef ER_SP_DUP_COND
+  case ER_SP_DUP_COND                         : return "42000";
+#endif
+#ifdef ER_SP_DUP_CURS
+  case ER_SP_DUP_CURS                         : return "42000";
+#endif
+#ifdef ER_SP_SUBSELECT_NYI
+  case ER_SP_SUBSELECT_NYI                    : return "0A000";
+#endif
+#ifdef ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
+  case ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG       : return "0A000";
+#endif
+#ifdef ER_SP_VARCOND_AFTER_CURSHNDLR
+  case ER_SP_VARCOND_AFTER_CURSHNDLR          : return "42000";
+#endif
+#ifdef ER_SP_CURSOR_AFTER_HANDLER
+  case ER_SP_CURSOR_AFTER_HANDLER             : return "42000";
+#endif
+#ifdef ER_SP_CASE_NOT_FOUND
+  case ER_SP_CASE_NOT_FOUND                   : return "20000";
+#endif
+#ifdef ER_DIVISION_BY_ZERO
+  case ER_DIVISION_BY_ZERO                    : return "22012";
+#endif
+#ifdef ER_ILLEGAL_VALUE_FOR_TYPE
+  case ER_ILLEGAL_VALUE_FOR_TYPE              : return "22007";
+#endif
+#ifdef ER_PROCACCESS_DENIED_ERROR
+  case ER_PROCACCESS_DENIED_ERROR             : return "42000";
+#endif
+#ifdef ER_XAER_NOTA
+  case ER_XAER_NOTA                           : return "XAE04";
+#endif
+#ifdef ER_XAER_INVAL
+  case ER_XAER_INVAL                          : return "XAE05";
+#endif
+#ifdef ER_XAER_RMFAIL
+  case ER_XAER_RMFAIL                         : return "XAE07";
+#endif
+#ifdef ER_XAER_OUTSIDE
+  case ER_XAER_OUTSIDE                        : return "XAE09";
+#endif
+#ifdef ER_XAER_RMERR
+  case ER_XAER_RMERR                          : return "XAE03";
+#endif
+#ifdef ER_XA_RBROLLBACK
+  case ER_XA_RBROLLBACK                       : return "XA100";
+#endif
+#ifdef ER_NONEXISTING_PROC_GRANT
+  case ER_NONEXISTING_PROC_GRANT              : return "42000";
+#endif
+#ifdef ER_DATA_TOO_LONG
+  case ER_DATA_TOO_LONG                       : return "22001";
+#endif
+#ifdef ER_SP_BAD_SQLSTATE
+  case ER_SP_BAD_SQLSTATE                     : return "42000";
+#endif
+#ifdef ER_CANT_CREATE_USER_WITH_GRANT
+  case ER_CANT_CREATE_USER_WITH_GRANT         : return "42000";
+#endif
+#ifdef ER_SP_DUP_HANDLER
+  case ER_SP_DUP_HANDLER                      : return "42000";
+#endif
+#ifdef ER_SP_NOT_VAR_ARG
+  case ER_SP_NOT_VAR_ARG                      : return "42000";
+#endif
+#ifdef ER_SP_NO_RETSET
+  case ER_SP_NO_RETSET                        : return "0A000";
+#endif
+#ifdef ER_CANT_CREATE_GEOMETRY_OBJECT
+  case ER_CANT_CREATE_GEOMETRY_OBJECT         : return "22003";
+#endif
+#ifdef ER_TOO_BIG_SCALE
+  case ER_TOO_BIG_SCALE                       : return "42000";
+#endif
+#ifdef ER_TOO_BIG_PRECISION
+  case ER_TOO_BIG_PRECISION                   : return "42000";
+#endif
+#ifdef ER_M_BIGGER_THAN_D
+  case ER_M_BIGGER_THAN_D                     : return "42000";
+#endif
+#ifdef ER_TOO_LONG_BODY
+  case ER_TOO_LONG_BODY                       : return "42000";
+#endif
+#ifdef ER_TOO_BIG_DISPLAYWIDTH
+  case ER_TOO_BIG_DISPLAYWIDTH                : return "42000";
+#endif
+#ifdef ER_XAER_DUPID
+  case ER_XAER_DUPID                          : return "XAE08";
+#endif
+#ifdef ER_DATETIME_FUNCTION_OVERFLOW
+  case ER_DATETIME_FUNCTION_OVERFLOW          : return "22008";
+#endif
+#ifdef ER_ROW_IS_REFERENCED_2
+  case ER_ROW_IS_REFERENCED_2                 : return "23000";
+#endif
+#ifdef ER_NO_REFERENCED_ROW_2
+  case ER_NO_REFERENCED_ROW_2                 : return "23000";
+#endif
+#ifdef ER_SP_BAD_VAR_SHADOW
+  case ER_SP_BAD_VAR_SHADOW                   : return "42000";
+#endif
+#ifdef ER_SP_WRONG_NAME
+  case ER_SP_WRONG_NAME                       : return "42000";
+#endif
+#ifdef ER_SP_NO_AGGREGATE
+  case ER_SP_NO_AGGREGATE                     : return "42000";
+#endif
+#ifdef ER_MAX_PREPARED_STMT_COUNT_REACHED
+  case ER_MAX_PREPARED_STMT_COUNT_REACHED     : return "42000";
+#endif
+#ifdef ER_NON_GROUPING_FIELD_USED
+  case ER_NON_GROUPING_FIELD_USED             : return "42000";
+#endif
+#ifdef ER_FOREIGN_DUPLICATE_KEY
+  case ER_FOREIGN_DUPLICATE_KEY               : return "23000";
+#endif
+#ifdef ER_CANT_CHANGE_TX_ISOLATION
+  case ER_CANT_CHANGE_TX_ISOLATION            : return "25001";
+#endif
+#ifdef ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+  case ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT      : return "42000";
+#endif
+#ifdef ER_WRONG_PARAMETERS_TO_NATIVE_FCT
+  case ER_WRONG_PARAMETERS_TO_NATIVE_FCT      : return "42000";
+#endif
+#ifdef ER_WRONG_PARAMETERS_TO_STORED_FCT
+  case ER_WRONG_PARAMETERS_TO_STORED_FCT      : return "42000";
+#endif
+#ifdef ER_DUP_ENTRY_WITH_KEY_NAME
+  case ER_DUP_ENTRY_WITH_KEY_NAME             : return "23000";
+#endif
+#ifdef ER_XA_RBTIMEOUT
+  case ER_XA_RBTIMEOUT                        : return "XA106";
+#endif
+#ifdef ER_XA_RBDEADLOCK
+  case ER_XA_RBDEADLOCK                       : return "XA102";
+#endif
+#ifdef ER_FUNC_INEXISTENT_NAME_COLLISION
+  case ER_FUNC_INEXISTENT_NAME_COLLISION      : return "42000";
+#endif
+#ifdef ER_DUP_SIGNAL_SET
+  case ER_DUP_SIGNAL_SET                      : return "42000";
+#endif
+#ifdef ER_SIGNAL_WARN
+  case ER_SIGNAL_WARN                         : return "01000";
+#endif
+#ifdef ER_SIGNAL_NOT_FOUND
+  case ER_SIGNAL_NOT_FOUND                    : return "02000";
+#endif
+#ifdef ER_SIGNAL_EXCEPTION
+  case ER_SIGNAL_EXCEPTION                    : return "HY000";
+#endif
+#ifdef ER_RESIGNAL_WITHOUT_ACTIVE_HANDLER
+  case ER_RESIGNAL_WITHOUT_ACTIVE_HANDLER     : return "0K000";
+#endif
+#ifdef ER_SPATIAL_MUST_HAVE_GEOM_COL
+  case ER_SPATIAL_MUST_HAVE_GEOM_COL          : return "42000";
+#endif
+#ifdef ER_DATA_OUT_OF_RANGE
+  case ER_DATA_OUT_OF_RANGE                   : return "22003";
+#endif

Modified: php/php-src/trunk/ext/pdo_mysql/get_error_codes.php
===================================================================
--- php/php-src/trunk/ext/pdo_mysql/get_error_codes.php	2011-08-31 15:44:01 UTC (rev \
                315904)
+++ php/php-src/trunk/ext/pdo_mysql/get_error_codes.php	2011-08-31 15:46:07 UTC (rev \
315905) @@ -5,7 +5,7 @@
 	while (!feof(STDIN)) {
 		$line = fgets(STDIN);

-		if (ereg('^(ER_.*),[[:space:]]+"(.*)",[[:space:]]+"(.*)"', $line, $matches)) {
+		if (ereg('^\{[[:space:]]+(ER_.*)[[:space:]]+,[[:space:]]*"(.*)",[[:space:]]*"(.*)"', \
$line, $matches)) {  $codes[$matches[1]] = $matches[2];
 			$maxlen = max($maxlen, strlen($matches[1]));
 		}
@@ -24,4 +24,4 @@
 	}


-?>
\ No newline at end of file
+?>

Modified: php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_sqlstate.h
===================================================================
--- php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_sqlstate.h	2011-08-31 15:44:01 UTC \
                (rev 315904)
+++ php/php-src/trunk/ext/pdo_mysql/php_pdo_mysql_sqlstate.h	2011-08-31 15:46:07 UTC \
(rev 315905) @@ -1,388 +1,646 @@
 /* DO NOT EDIT THIS FILE!!! It is auto generated by get_error_codes.php */
-#ifdef ER_DUP_KEY
-  case ER_DUP_KEY                           : return "23000";
+#ifdef ER_DUP_KEY
+  case ER_DUP_KEY                             : return "23000";
 #endif
-#ifdef ER_OUTOFMEMORY
-  case ER_OUTOFMEMORY                       : return "HY001";
+#ifdef ER_OUTOFMEMORY
+  case ER_OUTOFMEMORY                         : return "HY001";
 #endif
-#ifdef ER_OUT_OF_SORTMEMORY
-  case ER_OUT_OF_SORTMEMORY                 : return "HY001";
+#ifdef ER_OUT_OF_SORTMEMORY
+  case ER_OUT_OF_SORTMEMORY                   : return "HY001";
 #endif
-#ifdef ER_CON_COUNT_ERROR
-  case ER_CON_COUNT_ERROR                   : return "08004";
+#ifdef ER_CON_COUNT_ERROR
+  case ER_CON_COUNT_ERROR                     : return "08004";
 #endif
-#ifdef ER_BAD_HOST_ERROR
-  case ER_BAD_HOST_ERROR                    : return "08S01";
+#ifdef ER_BAD_HOST_ERROR
+  case ER_BAD_HOST_ERROR                      : return "08S01";
 #endif
-#ifdef ER_HANDSHAKE_ERROR
-  case ER_HANDSHAKE_ERROR                   : return "08S01";
+#ifdef ER_HANDSHAKE_ERROR
+  case ER_HANDSHAKE_ERROR                     : return "08S01";
 #endif
-#ifdef ER_DBACCESS_DENIED_ERROR
-  case ER_DBACCESS_DENIED_ERROR             : return "42000";
+#ifdef ER_DBACCESS_DENIED_ERROR
+  case ER_DBACCESS_DENIED_ERROR               : return "42000";
 #endif
-#ifdef ER_ACCESS_DENIED_ERROR
-  case ER_ACCESS_DENIED_ERROR               : return "28000";
+#ifdef ER_ACCESS_DENIED_ERROR
+  case ER_ACCESS_DENIED_ERROR                 : return "28000";
 #endif
-#ifdef ER_NO_DB_ERROR
-  case ER_NO_DB_ERROR                       : return "3D000";
+#ifdef ER_NO_DB_ERROR
+  case ER_NO_DB_ERROR                         : return "3D000";
 #endif
-#ifdef ER_UNKNOWN_COM_ERROR
-  case ER_UNKNOWN_COM_ERROR                 : return "08S01";
+#ifdef ER_UNKNOWN_COM_ERROR
+  case ER_UNKNOWN_COM_ERROR                   : return "08S01";
 #endif
-#ifdef ER_BAD_NULL_ERROR
-  case ER_BAD_NULL_ERROR                    : return "23000";
+#ifdef ER_BAD_NULL_ERROR
+  case ER_BAD_NULL_ERROR                      : return "23000";
 #endif
-#ifdef ER_BAD_DB_ERROR
-  case ER_BAD_DB_ERROR                      : return "42000";
+#ifdef ER_BAD_DB_ERROR
+  case ER_BAD_DB_ERROR                        : return "42000";
 #endif
-#ifdef ER_TABLE_EXISTS_ERROR
-  case ER_TABLE_EXISTS_ERROR                : return "42S01";
+#ifdef ER_TABLE_EXISTS_ERROR
+  case ER_TABLE_EXISTS_ERROR                  : return "42S01";
 #endif
-#ifdef ER_BAD_TABLE_ERROR
-  case ER_BAD_TABLE_ERROR                   : return "42S02";
+#ifdef ER_BAD_TABLE_ERROR
+  case ER_BAD_TABLE_ERROR                     : return "42S02";
 #endif
-#ifdef ER_NON_UNIQ_ERROR
-  case ER_NON_UNIQ_ERROR                    : return "23000";
+#ifdef ER_NON_UNIQ_ERROR
+  case ER_NON_UNIQ_ERROR                      : return "23000";
 #endif
-#ifdef ER_SERVER_SHUTDOWN
-  case ER_SERVER_SHUTDOWN                   : return "08S01";
+#ifdef ER_SERVER_SHUTDOWN
+  case ER_SERVER_SHUTDOWN                     : return "08S01";
 #endif
-#ifdef ER_BAD_FIELD_ERROR
-  case ER_BAD_FIELD_ERROR                   : return "42S22";
+#ifdef ER_BAD_FIELD_ERROR
+  case ER_BAD_FIELD_ERROR                     : return "42S22";
 #endif
-#ifdef ER_WRONG_FIELD_WITH_GROUP
-  case ER_WRONG_FIELD_WITH_GROUP            : return "42000";
+#ifdef ER_WRONG_FIELD_WITH_GROUP
+  case ER_WRONG_FIELD_WITH_GROUP              : return "42000";
 #endif
-#ifdef ER_WRONG_GROUP_FIELD
-  case ER_WRONG_GROUP_FIELD                 : return "42000";
+#ifdef ER_WRONG_GROUP_FIELD
+  case ER_WRONG_GROUP_FIELD                   : return "42000";
 #endif
-#ifdef ER_WRONG_SUM_SELECT
-  case ER_WRONG_SUM_SELECT                  : return "42000";
+#ifdef ER_WRONG_SUM_SELECT
+  case ER_WRONG_SUM_SELECT                    : return "42000";
 #endif
-#ifdef ER_WRONG_VALUE_COUNT
-  case ER_WRONG_VALUE_COUNT                 : return "21S01";
+#ifdef ER_WRONG_VALUE_COUNT
+  case ER_WRONG_VALUE_COUNT                   : return "21S01";
 #endif
-#ifdef ER_TOO_LONG_IDENT
-  case ER_TOO_LONG_IDENT                    : return "42000";
+#ifdef ER_TOO_LONG_IDENT
+  case ER_TOO_LONG_IDENT                      : return "42000";
 #endif
-#ifdef ER_DUP_FIELDNAME
-  case ER_DUP_FIELDNAME                     : return "42S21";
+#ifdef ER_DUP_FIELDNAME
+  case ER_DUP_FIELDNAME                       : return "42S21";
 #endif
-#ifdef ER_DUP_KEYNAME
-  case ER_DUP_KEYNAME                       : return "42000";
+#ifdef ER_DUP_KEYNAME
+  case ER_DUP_KEYNAME                         : return "42000";
 #endif
-#ifdef ER_DUP_ENTRY
-  case ER_DUP_ENTRY                         : return "23000";
+#ifdef ER_DUP_ENTRY
+  case ER_DUP_ENTRY                           : return "23000";
 #endif
-#ifdef ER_WRONG_FIELD_SPEC
-  case ER_WRONG_FIELD_SPEC                  : return "42000";
+#ifdef ER_WRONG_FIELD_SPEC
+  case ER_WRONG_FIELD_SPEC                    : return "42000";
 #endif
-#ifdef ER_PARSE_ERROR
-  case ER_PARSE_ERROR                       : return "42000";
+#ifdef ER_PARSE_ERROR
+  case ER_PARSE_ERROR                         : return "42000";
 #endif
-#ifdef ER_NONUNIQ_TABLE
-  case ER_NONUNIQ_TABLE                     : return "42000";
+#ifdef ER_EMPTY_QUERY
+  case ER_EMPTY_QUERY                         : return "42000";
 #endif
-#ifdef ER_INVALID_DEFAULT
-  case ER_INVALID_DEFAULT                   : return "42000";
+#ifdef ER_NONUNIQ_TABLE
+  case ER_NONUNIQ_TABLE                       : return "42000";
 #endif
-#ifdef ER_MULTIPLE_PRI_KEY
-  case ER_MULTIPLE_PRI_KEY                  : return "42000";
+#ifdef ER_INVALID_DEFAULT
+  case ER_INVALID_DEFAULT                     : return "42000";
 #endif
-#ifdef ER_TOO_MANY_KEYS
-  case ER_TOO_MANY_KEYS                     : return "42000";
+#ifdef ER_MULTIPLE_PRI_KEY
+  case ER_MULTIPLE_PRI_KEY                    : return "42000";
 #endif
-#ifdef ER_TOO_MANY_KEY_PARTS
-  case ER_TOO_MANY_KEY_PARTS                : return "42000";
+#ifdef ER_TOO_MANY_KEYS
+  case ER_TOO_MANY_KEYS                       : return "42000";
 #endif
-#ifdef ER_TOO_LONG_KEY
-  case ER_TOO_LONG_KEY                      : return "42000";
+#ifdef ER_TOO_MANY_KEY_PARTS
+  case ER_TOO_MANY_KEY_PARTS                  : return "42000";
 #endif
-#ifdef ER_KEY_COLUMN_DOES_NOT_EXITS
-  case ER_KEY_COLUMN_DOES_NOT_EXITS         : return "42000";
+#ifdef ER_TOO_LONG_KEY
+  case ER_TOO_LONG_KEY                        : return "42000";
 #endif
-#ifdef ER_BLOB_USED_AS_KEY
-  case ER_BLOB_USED_AS_KEY                  : return "42000";
+#ifdef ER_KEY_COLUMN_DOES_NOT_EXITS
+  case ER_KEY_COLUMN_DOES_NOT_EXITS           : return "42000";
 #endif
-#ifdef ER_TOO_BIG_FIELDLENGTH
-  case ER_TOO_BIG_FIELDLENGTH               : return "42000";
+#ifdef ER_BLOB_USED_AS_KEY
+  case ER_BLOB_USED_AS_KEY                    : return "42000";
 #endif
-#ifdef ER_WRONG_AUTO_KEY
-  case ER_WRONG_AUTO_KEY                    : return "42000";
+#ifdef ER_TOO_BIG_FIELDLENGTH
+  case ER_TOO_BIG_FIELDLENGTH                 : return "42000";
 #endif
-#ifdef ER_FORCING_CLOSE
-  case ER_FORCING_CLOSE                     : return "08S01";
+#ifdef ER_WRONG_AUTO_KEY
+  case ER_WRONG_AUTO_KEY                      : return "42000";
 #endif
-#ifdef ER_IPSOCK_ERROR
-  case ER_IPSOCK_ERROR                      : return "08S01";
+#ifdef ER_FORCING_CLOSE
+  case ER_FORCING_CLOSE                       : return "08S01";
 #endif
-#ifdef ER_NO_SUCH_INDEX
-  case ER_NO_SUCH_INDEX                     : return "42S12";
+#ifdef ER_IPSOCK_ERROR
+  case ER_IPSOCK_ERROR                        : return "08S01";
 #endif
-#ifdef ER_WRONG_FIELD_TERMINATORS
-  case ER_WRONG_FIELD_TERMINATORS           : return "42000";
+#ifdef ER_NO_SUCH_INDEX
+  case ER_NO_SUCH_INDEX                       : return "42S12";
 #endif
-#ifdef ER_BLOBS_AND_NO_TERMINATED
-  case ER_BLOBS_AND_NO_TERMINATED           : return "42000";
+#ifdef ER_WRONG_FIELD_TERMINATORS
+  case ER_WRONG_FIELD_TERMINATORS             : return "42000";
 #endif
-#ifdef ER_CANT_REMOVE_ALL_FIELDS
-  case ER_CANT_REMOVE_ALL_FIELDS            : return "42000";
+#ifdef ER_BLOBS_AND_NO_TERMINATED
+  case ER_BLOBS_AND_NO_TERMINATED             : return "42000";
 #endif
-#ifdef ER_CANT_DROP_FIELD_OR_KEY
-  case ER_CANT_DROP_FIELD_OR_KEY            : return "42000";
+#ifdef ER_CANT_REMOVE_ALL_FIELDS
+  case ER_CANT_REMOVE_ALL_FIELDS              : return "42000";
 #endif
-#ifdef ER_BLOB_CANT_HAVE_DEFAULT
-  case ER_BLOB_CANT_HAVE_DEFAULT            : return "42000";
+#ifdef ER_CANT_DROP_FIELD_OR_KEY
+  case ER_CANT_DROP_FIELD_OR_KEY              : return "42000";
 #endif
-#ifdef ER_WRONG_DB_NAME
-  case ER_WRONG_DB_NAME                     : return "42000";
+#ifdef ER_BLOB_CANT_HAVE_DEFAULT
+  case ER_BLOB_CANT_HAVE_DEFAULT              : return "42000";
 #endif
-#ifdef ER_WRONG_TABLE_NAME
-  case ER_WRONG_TABLE_NAME                  : return "42000";
+#ifdef ER_WRONG_DB_NAME
+  case ER_WRONG_DB_NAME                       : return "42000";
 #endif
-#ifdef ER_TOO_BIG_SELECT
-  case ER_TOO_BIG_SELECT                    : return "42000";
+#ifdef ER_WRONG_TABLE_NAME
+  case ER_WRONG_TABLE_NAME                    : return "42000";
 #endif
-#ifdef ER_UNKNOWN_PROCEDURE
-  case ER_UNKNOWN_PROCEDURE                 : return "42000";
+#ifdef ER_TOO_BIG_SELECT
+  case ER_TOO_BIG_SELECT                      : return "42000";
 #endif
-#ifdef ER_WRONG_PARAMCOUNT_TO_PROCEDURE
-  case ER_WRONG_PARAMCOUNT_TO_PROCEDURE     : return "42000";
+#ifdef ER_UNKNOWN_PROCEDURE
+  case ER_UNKNOWN_PROCEDURE                   : return "42000";
 #endif
-#ifdef ER_UNKNOWN_TABLE
-  case ER_UNKNOWN_TABLE                     : return "42S02";
+#ifdef ER_WRONG_PARAMCOUNT_TO_PROCEDURE
+  case ER_WRONG_PARAMCOUNT_TO_PROCEDURE       : return "42000";
 #endif
-#ifdef ER_FIELD_SPECIFIED_TWICE
-  case ER_FIELD_SPECIFIED_TWICE             : return "42000";
+#ifdef ER_UNKNOWN_TABLE
+  case ER_UNKNOWN_TABLE                       : return "42S02";
 #endif
-#ifdef ER_UNSUPPORTED_EXTENSION
-  case ER_UNSUPPORTED_EXTENSION             : return "42000";
+#ifdef ER_FIELD_SPECIFIED_TWICE
+  case ER_FIELD_SPECIFIED_TWICE               : return "42000";
 #endif
-#ifdef ER_TABLE_MUST_HAVE_COLUMNS
-  case ER_TABLE_MUST_HAVE_COLUMNS           : return "42000";
+#ifdef ER_UNSUPPORTED_EXTENSION
+  case ER_UNSUPPORTED_EXTENSION               : return "42000";
 #endif
-#ifdef ER_UNKNOWN_CHARACTER_SET
-  case ER_UNKNOWN_CHARACTER_SET             : return "42000";
+#ifdef ER_TABLE_MUST_HAVE_COLUMNS
+  case ER_TABLE_MUST_HAVE_COLUMNS             : return "42000";
 #endif
-#ifdef ER_TOO_BIG_ROWSIZE
-  case ER_TOO_BIG_ROWSIZE                   : return "42000";
+#ifdef ER_UNKNOWN_CHARACTER_SET
+  case ER_UNKNOWN_CHARACTER_SET               : return "42000";
 #endif
-#ifdef ER_WRONG_OUTER_JOIN
-  case ER_WRONG_OUTER_JOIN                  : return "42000";
+#ifdef ER_TOO_BIG_ROWSIZE
+  case ER_TOO_BIG_ROWSIZE                     : return "42000";
 #endif
-#ifdef ER_NULL_COLUMN_IN_INDEX
-  case ER_NULL_COLUMN_IN_INDEX              : return "42000";
+#ifdef ER_WRONG_OUTER_JOIN
+  case ER_WRONG_OUTER_JOIN                    : return "42000";
 #endif
-#ifdef ER_PASSWORD_ANONYMOUS_USER
-  case ER_PASSWORD_ANONYMOUS_USER           : return "42000";
+#ifdef ER_NULL_COLUMN_IN_INDEX
+  case ER_NULL_COLUMN_IN_INDEX                : return "42000";
 #endif
-#ifdef ER_PASSWORD_NOT_ALLOWED
-  case ER_PASSWORD_NOT_ALLOWED              : return "42000";
+#ifdef ER_PASSWORD_ANONYMOUS_USER
+  case ER_PASSWORD_ANONYMOUS_USER             : return "42000";
 #endif
-#ifdef ER_PASSWORD_NO_MATCH
-  case ER_PASSWORD_NO_MATCH                 : return "42000";
+#ifdef ER_PASSWORD_NOT_ALLOWED
+  case ER_PASSWORD_NOT_ALLOWED                : return "42000";
 #endif
-#ifdef ER_WRONG_VALUE_COUNT_ON_ROW
-  case ER_WRONG_VALUE_COUNT_ON_ROW          : return "21S01";
+#ifdef ER_PASSWORD_NO_MATCH
+  case ER_PASSWORD_NO_MATCH                   : return "42000";
 #endif
-#ifdef ER_INVALID_USE_OF_NULL
-  case ER_INVALID_USE_OF_NULL               : return "42000";
+#ifdef ER_WRONG_VALUE_COUNT_ON_ROW
+  case ER_WRONG_VALUE_COUNT_ON_ROW            : return "21S01";
 #endif
-#ifdef ER_REGEXP_ERROR
-  case ER_REGEXP_ERROR                      : return "42000";
+#ifdef ER_INVALID_USE_OF_NULL
+  case ER_INVALID_USE_OF_NULL                 : return "22004";
 #endif
-#ifdef ER_NONEXISTING_GRANT
-  case ER_NONEXISTING_GRANT                 : return "42000";
+#ifdef ER_REGEXP_ERROR
+  case ER_REGEXP_ERROR                        : return "42000";
 #endif
-#ifdef ER_TABLEACCESS_DENIED_ERROR
-  case ER_TABLEACCESS_DENIED_ERROR          : return "42000";
+#ifdef ER_MIX_OF_GROUP_FUNC_AND_FIELDS
+  case ER_MIX_OF_GROUP_FUNC_AND_FIELDS        : return "42000";
 #endif
-#ifdef ER_COLUMNACCESS_DENIED_ERROR
-  case ER_COLUMNACCESS_DENIED_ERROR         : return "42000";
+#ifdef ER_NONEXISTING_GRANT
+  case ER_NONEXISTING_GRANT                   : return "42000";
 #endif
-#ifdef ER_ILLEGAL_GRANT_FOR_TABLE
-  case ER_ILLEGAL_GRANT_FOR_TABLE           : return "42000";
+#ifdef ER_TABLEACCESS_DENIED_ERROR
+  case ER_TABLEACCESS_DENIED_ERROR            : return "42000";
 #endif
-#ifdef ER_GRANT_WRONG_HOST_OR_USER
-  case ER_GRANT_WRONG_HOST_OR_USER          : return "42000";
+#ifdef ER_COLUMNACCESS_DENIED_ERROR
+  case ER_COLUMNACCESS_DENIED_ERROR           : return "42000";
 #endif
-#ifdef ER_NO_SUCH_TABLE
-  case ER_NO_SUCH_TABLE                     : return "42S02";
+#ifdef ER_ILLEGAL_GRANT_FOR_TABLE
+  case ER_ILLEGAL_GRANT_FOR_TABLE             : return "42000";
 #endif
-#ifdef ER_NONEXISTING_TABLE_GRANT
-  case ER_NONEXISTING_TABLE_GRANT           : return "42000";
+#ifdef ER_GRANT_WRONG_HOST_OR_USER
+  case ER_GRANT_WRONG_HOST_OR_USER            : return "42000";
 #endif
-#ifdef ER_NOT_ALLOWED_COMMAND
-  case ER_NOT_ALLOWED_COMMAND               : return "42000";
+#ifdef ER_NO_SUCH_TABLE
+  case ER_NO_SUCH_TABLE                       : return "42S02";
 #endif
-#ifdef ER_SYNTAX_ERROR
-  case ER_SYNTAX_ERROR                      : return "42000";
+#ifdef ER_NONEXISTING_TABLE_GRANT
+  case ER_NONEXISTING_TABLE_GRANT             : return "42000";
 #endif
-#ifdef ER_ABORTING_CONNECTION
-  case ER_ABORTING_CONNECTION               : return "08S01";
+#ifdef ER_NOT_ALLOWED_COMMAND
+  case ER_NOT_ALLOWED_COMMAND                 : return "42000";
 #endif
-#ifdef ER_NET_PACKET_TOO_LARGE
-  case ER_NET_PACKET_TOO_LARGE              : return "08S01";
+#ifdef ER_SYNTAX_ERROR
+  case ER_SYNTAX_ERROR                        : return "42000";
 #endif
-#ifdef ER_NET_READ_ERROR_FROM_PIPE
-  case ER_NET_READ_ERROR_FROM_PIPE          : return "08S01";
+#ifdef ER_ABORTING_CONNECTION
+  case ER_ABORTING_CONNECTION                 : return "08S01";
 #endif
-#ifdef ER_NET_FCNTL_ERROR
-  case ER_NET_FCNTL_ERROR                   : return "08S01";
+#ifdef ER_NET_PACKET_TOO_LARGE
+  case ER_NET_PACKET_TOO_LARGE                : return "08S01";
 #endif
-#ifdef ER_NET_PACKETS_OUT_OF_ORDER
-  case ER_NET_PACKETS_OUT_OF_ORDER          : return "08S01";
+#ifdef ER_NET_READ_ERROR_FROM_PIPE
+  case ER_NET_READ_ERROR_FROM_PIPE            : return "08S01";
 #endif
-#ifdef ER_NET_UNCOMPRESS_ERROR
-  case ER_NET_UNCOMPRESS_ERROR              : return "08S01";
+#ifdef ER_NET_FCNTL_ERROR
+  case ER_NET_FCNTL_ERROR                     : return "08S01";
 #endif
-#ifdef ER_NET_READ_ERROR
-  case ER_NET_READ_ERROR                    : return "08S01";
+#ifdef ER_NET_PACKETS_OUT_OF_ORDER
+  case ER_NET_PACKETS_OUT_OF_ORDER            : return "08S01";
 #endif
-#ifdef ER_NET_READ_INTERRUPTED
-  case ER_NET_READ_INTERRUPTED              : return "08S01";
+#ifdef ER_NET_UNCOMPRESS_ERROR
+  case ER_NET_UNCOMPRESS_ERROR                : return "08S01";
 #endif
-#ifdef ER_NET_ERROR_ON_WRITE
-  case ER_NET_ERROR_ON_WRITE                : return "08S01";
+#ifdef ER_NET_READ_ERROR
+  case ER_NET_READ_ERROR                      : return "08S01";
 #endif
-#ifdef ER_NET_WRITE_INTERRUPTED
-  case ER_NET_WRITE_INTERRUPTED             : return "08S01";
+#ifdef ER_NET_READ_INTERRUPTED
+  case ER_NET_READ_INTERRUPTED                : return "08S01";
 #endif
-#ifdef ER_TOO_LONG_STRING
-  case ER_TOO_LONG_STRING                   : return "42000";
+#ifdef ER_NET_ERROR_ON_WRITE
+  case ER_NET_ERROR_ON_WRITE                  : return "08S01";
 #endif
-#ifdef ER_TABLE_CANT_HANDLE_BLOB
-  case ER_TABLE_CANT_HANDLE_BLOB            : return "42000";
+#ifdef ER_NET_WRITE_INTERRUPTED
+  case ER_NET_WRITE_INTERRUPTED               : return "08S01";
 #endif
-#ifdef ER_TABLE_CANT_HANDLE_AUTO_INCREMENT
-  case ER_TABLE_CANT_HANDLE_AUTO_INCREMENT  : return "42000";
+#ifdef ER_TOO_LONG_STRING
+  case ER_TOO_LONG_STRING                     : return "42000";
 #endif
-#ifdef ER_WRONG_COLUMN_NAME
-  case ER_WRONG_COLUMN_NAME                 : return "42000";
+#ifdef ER_TABLE_CANT_HANDLE_BLOB
+  case ER_TABLE_CANT_HANDLE_BLOB              : return "42000";
 #endif
-#ifdef ER_WRONG_KEY_COLUMN
-  case ER_WRONG_KEY_COLUMN                  : return "42000";
+#ifdef ER_TABLE_CANT_HANDLE_AUTO_INCREMENT
+  case ER_TABLE_CANT_HANDLE_AUTO_INCREMENT    : return "42000";
 #endif
-#ifdef ER_DUP_UNIQUE
-  case ER_DUP_UNIQUE                        : return "23000";
+#ifdef ER_WRONG_COLUMN_NAME
+  case ER_WRONG_COLUMN_NAME                   : return "42000";
 #endif
-#ifdef ER_BLOB_KEY_WITHOUT_LENGTH
-  case ER_BLOB_KEY_WITHOUT_LENGTH           : return "42000";
+#ifdef ER_WRONG_KEY_COLUMN
+  case ER_WRONG_KEY_COLUMN                    : return "42000";
 #endif
-#ifdef ER_PRIMARY_CANT_HAVE_NULL
-  case ER_PRIMARY_CANT_HAVE_NULL            : return "42000";
+#ifdef ER_DUP_UNIQUE
+  case ER_DUP_UNIQUE                          : return "23000";
 #endif
-#ifdef ER_TOO_MANY_ROWS
-  case ER_TOO_MANY_ROWS                     : return "42000";
+#ifdef ER_BLOB_KEY_WITHOUT_LENGTH
+  case ER_BLOB_KEY_WITHOUT_LENGTH             : return "42000";
 #endif
-#ifdef ER_REQUIRES_PRIMARY_KEY
-  case ER_REQUIRES_PRIMARY_KEY              : return "42000";
+#ifdef ER_PRIMARY_CANT_HAVE_NULL
+  case ER_PRIMARY_CANT_HAVE_NULL              : return "42000";
 #endif
-#ifdef ER_CHECK_NO_SUCH_TABLE
-  case ER_CHECK_NO_SUCH_TABLE               : return "42000";
+#ifdef ER_TOO_MANY_ROWS
+  case ER_TOO_MANY_ROWS                       : return "42000";
 #endif
-#ifdef ER_CHECK_NOT_IMPLEMENTED
-  case ER_CHECK_NOT_IMPLEMENTED             : return "42000";
+#ifdef ER_REQUIRES_PRIMARY_KEY
+  case ER_REQUIRES_PRIMARY_KEY                : return "42000";
 #endif
-#ifdef ER_CANT_DO_THIS_DURING_AN_TRANSACTION
-  case ER_CANT_DO_THIS_DURING_AN_TRANSACTION: return "25000";
+#ifdef ER_KEY_DOES_NOT_EXITS
+  case ER_KEY_DOES_NOT_EXITS                  : return "42000";
 #endif
-#ifdef ER_NEW_ABORTING_CONNECTION
-  case ER_NEW_ABORTING_CONNECTION           : return "08S01";
+#ifdef ER_CHECK_NO_SUCH_TABLE
+  case ER_CHECK_NO_SUCH_TABLE                 : return "42000";
 #endif
-#ifdef ER_MASTER_NET_READ
-  case ER_MASTER_NET_READ                   : return "08S01";
+#ifdef ER_CHECK_NOT_IMPLEMENTED
+  case ER_CHECK_NOT_IMPLEMENTED               : return "42000";
 #endif
-#ifdef ER_MASTER_NET_WRITE
-  case ER_MASTER_NET_WRITE                  : return "08S01";
+#ifdef ER_CANT_DO_THIS_DURING_AN_TRANSACTION
+  case ER_CANT_DO_THIS_DURING_AN_TRANSACTION  : return "25000";
 #endif
-#ifdef ER_TOO_MANY_USER_CONNECTIONS
-  case ER_TOO_MANY_USER_CONNECTIONS         : return "42000";
+#ifdef ER_NEW_ABORTING_CONNECTION
+  case ER_NEW_ABORTING_CONNECTION             : return "08S01";
 #endif
-#ifdef ER_READ_ONLY_TRANSACTION
-  case ER_READ_ONLY_TRANSACTION             : return "25000";
+#ifdef ER_MASTER_NET_READ
+  case ER_MASTER_NET_READ                     : return "08S01";
 #endif
-#ifdef ER_LOCK_DEADLOCK
-  case ER_LOCK_DEADLOCK                     : return "40001";
+#ifdef ER_MASTER_NET_WRITE
+  case ER_MASTER_NET_WRITE                    : return "08S01";
 #endif
-#ifdef ER_NO_REFERENCED_ROW
-  case ER_NO_REFERENCED_ROW                 : return "23000";
+#ifdef ER_TOO_MANY_USER_CONNECTIONS
+  case ER_TOO_MANY_USER_CONNECTIONS           : return "42000";
 #endif
-#ifdef ER_ROW_IS_REFERENCED
-  case ER_ROW_IS_REFERENCED                 : return "23000";
+#ifdef ER_READ_ONLY_TRANSACTION
+  case ER_READ_ONLY_TRANSACTION               : return "25000";
 #endif
-#ifdef ER_CONNECT_TO_MASTER
-  case ER_CONNECT_TO_MASTER                 : return "08S01";
+#ifdef ER_NO_PERMISSION_TO_CREATE_USER
+  case ER_NO_PERMISSION_TO_CREATE_USER        : return "42000";
 #endif
-#ifdef ER_USER_LIMIT_REACHED
-  case ER_USER_LIMIT_REACHED                : return "42000";
+#ifdef ER_LOCK_DEADLOCK
+  case ER_LOCK_DEADLOCK                       : return "40001";
 #endif
-#ifdef ER_NO_DEFAULT
-  case ER_NO_DEFAULT                        : return "42000";
+#ifdef ER_NO_REFERENCED_ROW
+  case ER_NO_REFERENCED_ROW                   : return "23000";
 #endif
-#ifdef ER_WRONG_VALUE_FOR_VAR
-  case ER_WRONG_VALUE_FOR_VAR               : return "42000";
+#ifdef ER_ROW_IS_REFERENCED
+  case ER_ROW_IS_REFERENCED                   : return "23000";
 #endif
-#ifdef ER_WRONG_TYPE_FOR_VAR
-  case ER_WRONG_TYPE_FOR_VAR                : return "42000";
+#ifdef ER_CONNECT_TO_MASTER
+  case ER_CONNECT_TO_MASTER                   : return "08S01";
 #endif
-#ifdef ER_CANT_USE_OPTION_HERE
-  case ER_CANT_USE_OPTION_HERE              : return "42000";
+#ifdef ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT
+  case ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT   : return "21000";
 #endif
-#ifdef ER_NOT_SUPPORTED_YET
-  case ER_NOT_SUPPORTED_YET                 : return "42000";
+#ifdef ER_USER_LIMIT_REACHED
+  case ER_USER_LIMIT_REACHED                  : return "42000";
 #endif
-#ifdef ER_WRONG_FK_DEF
-  case ER_WRONG_FK_DEF                      : return "42000";
+#ifdef ER_SPECIFIC_ACCESS_DENIED_ERROR
+  case ER_SPECIFIC_ACCESS_DENIED_ERROR        : return "42000";
 #endif
-#ifdef ER_OPERAND_COLUMNS
-  case ER_OPERAND_COLUMNS                   : return "21000";
+#ifdef ER_NO_DEFAULT
+  case ER_NO_DEFAULT                          : return "42000";
 #endif
-#ifdef ER_SUBQUERY_NO_1_ROW
-  case ER_SUBQUERY_NO_1_ROW                 : return "21000";
+#ifdef ER_WRONG_VALUE_FOR_VAR
+  case ER_WRONG_VALUE_FOR_VAR                 : return "42000";
 #endif
-#ifdef ER_ILLEGAL_REFERENCE
-  case ER_ILLEGAL_REFERENCE                 : return "42S22";
+#ifdef ER_WRONG_TYPE_FOR_VAR
+  case ER_WRONG_TYPE_FOR_VAR                  : return "42000";
 #endif
-#ifdef ER_DERIVED_MUST_HAVE_ALIAS
-  case ER_DERIVED_MUST_HAVE_ALIAS           : return "42000";
+#ifdef ER_CANT_USE_OPTION_HERE
+  case ER_CANT_USE_OPTION_HERE                : return "42000";
 #endif
-#ifdef ER_SELECT_REDUCED
-  case ER_SELECT_REDUCED                    : return "01000";
+#ifdef ER_NOT_SUPPORTED_YET
+  case ER_NOT_SUPPORTED_YET                   : return "42000";
 #endif
-#ifdef ER_TABLENAME_NOT_ALLOWED_HERE
-  case ER_TABLENAME_NOT_ALLOWED_HERE        : return "42000";
+#ifdef ER_WRONG_FK_DEF
+  case ER_WRONG_FK_DEF                        : return "42000";
 #endif
-#ifdef ER_NOT_SUPPORTED_AUTH_MODE
-  case ER_NOT_SUPPORTED_AUTH_MODE           : return "08004";
+#ifdef ER_OPERAND_COLUMNS
+  case ER_OPERAND_COLUMNS                     : return "21000";
 #endif
-#ifdef ER_SPATIAL_CANT_HAVE_NULL
-  case ER_SPATIAL_CANT_HAVE_NULL            : return "42000";
+#ifdef ER_SUBQUERY_NO_1_ROW
+  case ER_SUBQUERY_NO_1_ROW                   : return "21000";
 #endif
-#ifdef ER_COLLATION_CHARSET_MISMATCH
-  case ER_COLLATION_CHARSET_MISMATCH        : return "42000";
+#ifdef ER_ILLEGAL_REFERENCE
+  case ER_ILLEGAL_REFERENCE                   : return "42S22";
 #endif
-#ifdef ER_WARN_TOO_FEW_RECORDS
-  case ER_WARN_TOO_FEW_RECORDS              : return "01000";
+#ifdef ER_DERIVED_MUST_HAVE_ALIAS
+  case ER_DERIVED_MUST_HAVE_ALIAS             : return "42000";
 #endif
-#ifdef ER_WARN_TOO_MANY_RECORDS
-  case ER_WARN_TOO_MANY_RECORDS             : return "01000";
+#ifdef ER_SELECT_REDUCED
+  case ER_SELECT_REDUCED                      : return "01000";
 #endif
-#ifdef ER_WARN_NULL_TO_NOTNULL
-  case ER_WARN_NULL_TO_NOTNULL              : return "01000";
+#ifdef ER_TABLENAME_NOT_ALLOWED_HERE
+  case ER_TABLENAME_NOT_ALLOWED_HERE          : return "42000";
 #endif
-#ifdef ER_WARN_DATA_OUT_OF_RANGE
-  case ER_WARN_DATA_OUT_OF_RANGE            : return "01000";
+#ifdef ER_NOT_SUPPORTED_AUTH_MODE
+  case ER_NOT_SUPPORTED_AUTH_MODE             : return "08004";
 #endif
-#ifdef ER_WARN_DATA_TRUNCATED
-  case ER_WARN_DATA_TRUNCATED               : return "01000";
+#ifdef ER_SPATIAL_CANT_HAVE_NULL
+  case ER_SPATIAL_CANT_HAVE_NULL              : return "42000";
 #endif
-#ifdef ER_WRONG_NAME_FOR_INDEX
-  case ER_WRONG_NAME_FOR_INDEX              : return "42000";
+#ifdef ER_COLLATION_CHARSET_MISMATCH
+  case ER_COLLATION_CHARSET_MISMATCH          : return "42000";
 #endif
-#ifdef ER_WRONG_NAME_FOR_CATALOG
-  case ER_WRONG_NAME_FOR_CATALOG            : return "42000";
+#ifdef ER_WARN_TOO_FEW_RECORDS
+  case ER_WARN_TOO_FEW_RECORDS                : return "01000";
 #endif
-#ifdef ER_UNKNOWN_STORAGE_ENGINE
-  case ER_UNKNOWN_STORAGE_ENGINE            : return "42000";
+#ifdef ER_WARN_TOO_MANY_RECORDS
+  case ER_WARN_TOO_MANY_RECORDS               : return "01000";
 #endif
+#ifdef ER_WARN_NULL_TO_NOTNULL
+  case ER_WARN_NULL_TO_NOTNULL                : return "22004";
+#endif
+#ifdef ER_WARN_DATA_OUT_OF_RANGE
+  case ER_WARN_DATA_OUT_OF_RANGE              : return "22003";
+#endif
+#ifdef ER_WRONG_NAME_FOR_INDEX
+  case ER_WRONG_NAME_FOR_INDEX                : return "42000";
+#endif
+#ifdef ER_WRONG_NAME_FOR_CATALOG
+  case ER_WRONG_NAME_FOR_CATALOG              : return "42000";
+#endif
+#ifdef ER_UNKNOWN_STORAGE_ENGINE
+  case ER_UNKNOWN_STORAGE_ENGINE              : return "42000";
+#endif
+#ifdef ER_TRUNCATED_WRONG_VALUE
+  case ER_TRUNCATED_WRONG_VALUE               : return "22007";
+#endif
+#ifdef ER_SP_NO_RECURSIVE_CREATE
+  case ER_SP_NO_RECURSIVE_CREATE              : return "2F003";
+#endif
+#ifdef ER_SP_ALREADY_EXISTS
+  case ER_SP_ALREADY_EXISTS                   : return "42000";
+#endif
+#ifdef ER_SP_DOES_NOT_EXIST
+  case ER_SP_DOES_NOT_EXIST                   : return "42000";
+#endif
+#ifdef ER_SP_LILABEL_MISMATCH
+  case ER_SP_LILABEL_MISMATCH                 : return "42000";
+#endif
+#ifdef ER_SP_LABEL_REDEFINE
+  case ER_SP_LABEL_REDEFINE                   : return "42000";
+#endif
+#ifdef ER_SP_LABEL_MISMATCH
+  case ER_SP_LABEL_MISMATCH                   : return "42000";
+#endif
+#ifdef ER_SP_UNINIT_VAR
+  case ER_SP_UNINIT_VAR                       : return "01000";
+#endif
+#ifdef ER_SP_BADSELECT
+  case ER_SP_BADSELECT                        : return "0A000";
+#endif
+#ifdef ER_SP_BADRETURN
+  case ER_SP_BADRETURN                        : return "42000";
+#endif
+#ifdef ER_SP_BADSTATEMENT
+  case ER_SP_BADSTATEMENT                     : return "0A000";
+#endif
+#ifdef ER_UPDATE_LOG_DEPRECATED_IGNORED
+  case ER_UPDATE_LOG_DEPRECATED_IGNORED       : return "42000";
+#endif
+#ifdef ER_UPDATE_LOG_DEPRECATED_TRANSLATED
+  case ER_UPDATE_LOG_DEPRECATED_TRANSLATED    : return "42000";
+#endif
+#ifdef ER_QUERY_INTERRUPTED
+  case ER_QUERY_INTERRUPTED                   : return "70100";
+#endif
+#ifdef ER_SP_WRONG_NO_OF_ARGS
+  case ER_SP_WRONG_NO_OF_ARGS                 : return "42000";
+#endif
+#ifdef ER_SP_COND_MISMATCH
+  case ER_SP_COND_MISMATCH                    : return "42000";
+#endif
+#ifdef ER_SP_NORETURN
+  case ER_SP_NORETURN                         : return "42000";
+#endif
+#ifdef ER_SP_NORETURNEND
+  case ER_SP_NORETURNEND                      : return "2F005";
+#endif
+#ifdef ER_SP_BAD_CURSOR_QUERY
+  case ER_SP_BAD_CURSOR_QUERY                 : return "42000";
+#endif
+#ifdef ER_SP_BAD_CURSOR_SELECT
+  case ER_SP_BAD_CURSOR_SELECT                : return "42000";
+#endif
+#ifdef ER_SP_CURSOR_MISMATCH
+  case ER_SP_CURSOR_MISMATCH                  : return "42000";
+#endif
+#ifdef ER_SP_CURSOR_ALREADY_OPEN
+  case ER_SP_CURSOR_ALREADY_OPEN              : return "24000";
+#endif
+#ifdef ER_SP_CURSOR_NOT_OPEN
+  case ER_SP_CURSOR_NOT_OPEN                  : return "24000";
+#endif
+#ifdef ER_SP_UNDECLARED_VAR
+  case ER_SP_UNDECLARED_VAR                   : return "42000";
+#endif
+#ifdef ER_SP_FETCH_NO_DATA
+  case ER_SP_FETCH_NO_DATA                    : return "02000";
+#endif
+#ifdef ER_SP_DUP_PARAM
+  case ER_SP_DUP_PARAM                        : return "42000";
+#endif
+#ifdef ER_SP_DUP_VAR
+  case ER_SP_DUP_VAR                          : return "42000";
+#endif
+#ifdef ER_SP_DUP_COND
+  case ER_SP_DUP_COND                         : return "42000";
+#endif
+#ifdef ER_SP_DUP_CURS
+  case ER_SP_DUP_CURS                         : return "42000";
+#endif
+#ifdef ER_SP_SUBSELECT_NYI
+  case ER_SP_SUBSELECT_NYI                    : return "0A000";
+#endif
+#ifdef ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG
+  case ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG       : return "0A000";
+#endif
+#ifdef ER_SP_VARCOND_AFTER_CURSHNDLR
+  case ER_SP_VARCOND_AFTER_CURSHNDLR          : return "42000";
+#endif
+#ifdef ER_SP_CURSOR_AFTER_HANDLER
+  case ER_SP_CURSOR_AFTER_HANDLER             : return "42000";
+#endif
+#ifdef ER_SP_CASE_NOT_FOUND
+  case ER_SP_CASE_NOT_FOUND                   : return "20000";
+#endif
+#ifdef ER_DIVISION_BY_ZERO
+  case ER_DIVISION_BY_ZERO                    : return "22012";
+#endif
+#ifdef ER_ILLEGAL_VALUE_FOR_TYPE
+  case ER_ILLEGAL_VALUE_FOR_TYPE              : return "22007";
+#endif
+#ifdef ER_PROCACCESS_DENIED_ERROR
+  case ER_PROCACCESS_DENIED_ERROR             : return "42000";
+#endif
+#ifdef ER_XAER_NOTA
+  case ER_XAER_NOTA                           : return "XAE04";
+#endif
+#ifdef ER_XAER_INVAL
+  case ER_XAER_INVAL                          : return "XAE05";
+#endif
+#ifdef ER_XAER_RMFAIL
+  case ER_XAER_RMFAIL                         : return "XAE07";
+#endif
+#ifdef ER_XAER_OUTSIDE
+  case ER_XAER_OUTSIDE                        : return "XAE09";
+#endif
+#ifdef ER_XAER_RMERR
+  case ER_XAER_RMERR                          : return "XAE03";
+#endif
+#ifdef ER_XA_RBROLLBACK
+  case ER_XA_RBROLLBACK                       : return "XA100";
+#endif
+#ifdef ER_NONEXISTING_PROC_GRANT
+  case ER_NONEXISTING_PROC_GRANT              : return "42000";
+#endif
+#ifdef ER_DATA_TOO_LONG
+  case ER_DATA_TOO_LONG                       : return "22001";
+#endif
+#ifdef ER_SP_BAD_SQLSTATE
+  case ER_SP_BAD_SQLSTATE                     : return "42000";
+#endif
+#ifdef ER_CANT_CREATE_USER_WITH_GRANT
+  case ER_CANT_CREATE_USER_WITH_GRANT         : return "42000";
+#endif
+#ifdef ER_SP_DUP_HANDLER
+  case ER_SP_DUP_HANDLER                      : return "42000";
+#endif
+#ifdef ER_SP_NOT_VAR_ARG
+  case ER_SP_NOT_VAR_ARG                      : return "42000";
+#endif
+#ifdef ER_SP_NO_RETSET
+  case ER_SP_NO_RETSET                        : return "0A000";
+#endif
+#ifdef ER_CANT_CREATE_GEOMETRY_OBJECT
+  case ER_CANT_CREATE_GEOMETRY_OBJECT         : return "22003";
+#endif
+#ifdef ER_TOO_BIG_SCALE
+  case ER_TOO_BIG_SCALE                       : return "42000";
+#endif
+#ifdef ER_TOO_BIG_PRECISION
+  case ER_TOO_BIG_PRECISION                   : return "42000";
+#endif
+#ifdef ER_M_BIGGER_THAN_D
+  case ER_M_BIGGER_THAN_D                     : return "42000";
+#endif
+#ifdef ER_TOO_LONG_BODY
+  case ER_TOO_LONG_BODY                       : return "42000";
+#endif
+#ifdef ER_TOO_BIG_DISPLAYWIDTH
+  case ER_TOO_BIG_DISPLAYWIDTH                : return "42000";
+#endif
+#ifdef ER_XAER_DUPID
+  case ER_XAER_DUPID                          : return "XAE08";
+#endif
+#ifdef ER_DATETIME_FUNCTION_OVERFLOW
+  case ER_DATETIME_FUNCTION_OVERFLOW          : return "22008";
+#endif
+#ifdef ER_ROW_IS_REFERENCED_2
+  case ER_ROW_IS_REFERENCED_2                 : return "23000";
+#endif
+#ifdef ER_NO_REFERENCED_ROW_2
+  case ER_NO_REFERENCED_ROW_2                 : return "23000";
+#endif
+#ifdef ER_SP_BAD_VAR_SHADOW
+  case ER_SP_BAD_VAR_SHADOW                   : return "42000";
+#endif
+#ifdef ER_SP_WRONG_NAME
+  case ER_SP_WRONG_NAME                       : return "42000";
+#endif
+#ifdef ER_SP_NO_AGGREGATE
+  case ER_SP_NO_AGGREGATE                     : return "42000";
+#endif
+#ifdef ER_MAX_PREPARED_STMT_COUNT_REACHED
+  case ER_MAX_PREPARED_STMT_COUNT_REACHED     : return "42000";
+#endif
+#ifdef ER_NON_GROUPING_FIELD_USED
+  case ER_NON_GROUPING_FIELD_USED             : return "42000";
+#endif
+#ifdef ER_FOREIGN_DUPLICATE_KEY
+  case ER_FOREIGN_DUPLICATE_KEY               : return "23000";
+#endif
+#ifdef ER_CANT_CHANGE_TX_ISOLATION
+  case ER_CANT_CHANGE_TX_ISOLATION            : return "25001";
+#endif
+#ifdef ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT
+  case ER_WRONG_PARAMCOUNT_TO_NATIVE_FCT      : return "42000";
+#endif
+#ifdef ER_WRONG_PARAMETERS_TO_NATIVE_FCT
+  case ER_WRONG_PARAMETERS_TO_NATIVE_FCT      : return "42000";
+#endif
+#ifdef ER_WRONG_PARAMETERS_TO_STORED_FCT
+  case ER_WRONG_PARAMETERS_TO_STORED_FCT      : return "42000";
+#endif
+#ifdef ER_DUP_ENTRY_WITH_KEY_NAME
+  case ER_DUP_ENTRY_WITH_KEY_NAME             : return "23000";
+#endif
+#ifdef ER_XA_RBTIMEOUT
+  case ER_XA_RBTIMEOUT                        : return "XA106";
+#endif
+#ifdef ER_XA_RBDEADLOCK
+  case ER_XA_RBDEADLOCK                       : return "XA102";
+#endif
+#ifdef ER_FUNC_INEXISTENT_NAME_COLLISION
+  case ER_FUNC_INEXISTENT_NAME_COLLISION      : return "42000";
+#endif
+#ifdef ER_DUP_SIGNAL_SET
+  case ER_DUP_SIGNAL_SET                      : return "42000";
+#endif
+#ifdef ER_SIGNAL_WARN
+  case ER_SIGNAL_WARN                         : return "01000";
+#endif
+#ifdef ER_SIGNAL_NOT_FOUND
+  case ER_SIGNAL_NOT_FOUND                    : return "02000";
+#endif
+#ifdef ER_SIGNAL_EXCEPTION
+  case ER_SIGNAL_EXCEPTION                    : return "HY000";
+#endif
+#ifdef ER_RESIGNAL_WITHOUT_ACTIVE_HANDLER
+  case ER_RESIGNAL_WITHOUT_ACTIVE_HANDLER     : return "0K000";
+#endif
+#ifdef ER_SPATIAL_MUST_HAVE_GEOM_COL
+  case ER_SPATIAL_MUST_HAVE_GEOM_COL          : return "42000";
+#endif
+#ifdef ER_DATA_OUT_OF_RANGE
+  case ER_DATA_OUT_OF_RANGE                   : return "22003";
+#endif



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic