diff options
| author | unknown <hf@deer.(none)> | 2003-06-17 21:53:13 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-17 21:53:13 +0500 |
| commit | 46cb15ccd477007c8ba2abaa90f86960a8adc7bd (patch) | |
| tree | 8bec4511106588d39e833346b08272d3d00f72ee /sql/protocol.cc | |
| parent | ef726bbff367ab6c5aa735655d8ff6c3fdccdb7d (diff) | |
| parent | a4792eefad19e4f70471952afedef2221fbfbd64 (diff) | |
| download | mariadb-git-46cb15ccd477007c8ba2abaa90f86960a8adc7bd.tar.gz | |
SCRUM
merged conflicts about my previous commit
it seems there are some errors left - gonna check...
BitKeeper/etc/logging_ok:
auto-union
client/mysqltest.c:
Auto merged
include/mysql_com.h:
Auto merged
include/sql_common.h:
Auto merged
include/mysql.h:
conflicts merged
libmysql/client_settings.h:
conflicts merged
libmysql/libmysql.c:
conflicts merged
sql-common/client.c:
conflicts merged
sql/client_settings.h:
conflicts merged
sql/protocol.cc:
conflict merged
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 62573da54f9..da363a478fd 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -103,8 +103,7 @@ void send_error(THD *thd, uint sql_errno, const char *err) { /* The first # is to make the protocol backward compatible */ buff[2]= '#'; - strmov(buff+3, mysql_errno_to_sqlstate(sql_errno)); - pos= buff + 2 + SQLSTATE_LENGTH +1; + pos= strmov(buff+3, mysql_errno_to_sqlstate(sql_errno)); } length= (uint) (strmake(pos, err, MYSQL_ERRMSG_SIZE-1) - buff); err=buff; |