diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-10-09 13:06:41 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-10-09 13:06:41 +0400 |
| commit | 9dff84347d6cb758c0027501c58345ef877773a3 (patch) | |
| tree | 62e98f865c4d831935560c631a06fb9e76207bc5 /sql/protocol.cc | |
| parent | b20a4f01c39bdee306672e3284bb0f2488c32bbe (diff) | |
| download | mariadb-git-9dff84347d6cb758c0027501c58345ef877773a3.tar.gz | |
Backport to 5.4 the following changesets:
revno: 2476.785.24
committer: kostja@bodhi.(none)
timestamp: Tue 2007-10-16 20:19:00 +0400
message:
Reflect a rename of a member in the client ABI (a compatible change).
----------------------------------------------------------
revno: 2476.423.26
committer: kostja@bodhi.(none)
timestamp: Tue 2007-10-16 20:12:37 +0400
message:
Update the client ABI to reflect member rename
(this is a backward-compatible change).
----------------------------------------------------------
revno: 2476.785.22
committer: kostja@bodhi.(none)
timestamp: Tue 2007-10-16 19:37:25 +0400
message:
Remove some remains of support of 3.22 protocol. This was in fact dead code,
since the option to talk 3.22 protocol was removed in 4.1 and there
is no other protocol negotiation mechanism besides this option.
include/mysql.h.pp:
Update ABI.
include/mysql_com.h:
Remove an unused 3.22 protocol member.
sql/field.cc:
Remove an unused 3.22 protocol check.
sql/mysqld.cc:
Remove an unused 3.22 protocol check.
sql/net_serv.cc:
Remove an unused 3.22 protocol variable initialization.
sql/protocol.cc:
Remove an unused 3.22 protocol check.
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 7abc051af68..86f95755bd9 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -394,27 +394,19 @@ bool net_send_error_packet(THD *thd, uint sql_errno, const char *err, DBUG_RETURN(FALSE); } - if (net->return_errno) - { // new client code; Add errno before message - int2store(buff,sql_errno); - pos= buff+2; - if (thd->client_capabilities & CLIENT_PROTOCOL_41) - { - /* The first # is to make the protocol backward compatible */ - buff[2]= '#'; - pos= (uchar*) strmov((char*) buff+3, sqlstate); - } - length= (uint) (strmake((char*) pos, err, MYSQL_ERRMSG_SIZE-1) - - (char*) buff); - err= (char*) buff; - } - else + int2store(buff,sql_errno); + pos= buff+2; + if (thd->client_capabilities & CLIENT_PROTOCOL_41) { - length=(uint) strlen(err); - set_if_smaller(length,MYSQL_ERRMSG_SIZE-1); + /* The first # is to make the protocol backward compatible */ + buff[2]= '#'; + pos= (uchar*) strmov((char*) buff+3, sqlstate); } + length= (uint) (strmake((char*) pos, err, MYSQL_ERRMSG_SIZE-1) - + (char*) buff); + err= (char*) buff; DBUG_RETURN(net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) err, - length)); + length)); } #endif /* EMBEDDED_LIBRARY */ |