diff options
| author | monty@narttu.mysql.fi <> | 2003-06-14 11:37:42 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-06-14 11:37:42 +0300 |
| commit | a1034db4b9f55172b75d1dcb5cd11a7d32c716b2 (patch) | |
| tree | f247f6e12388923f7fa5395b19d69e2dc62dbcd1 /sql/protocol.cc | |
| parent | bb8b0d9d760c57df04d0a403237834ac8fa16a35 (diff) | |
| download | mariadb-git-a1034db4b9f55172b75d1dcb5cd11a7d32c716b2.tar.gz | |
Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 10fe2c1725e..1d730836d6e 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; @@ -236,28 +235,6 @@ net_printf(THD *thd, uint errcode, ...) DBUG_VOID_RETURN; } -/* - Function called by my_net_init() to set some check variables -*/ - -#ifndef EMBEDDED_LIBRARY -extern "C" { -void my_net_local_init(NET *net) -{ - net->max_packet= (uint) global_system_variables.net_buffer_length; - net->read_timeout= (uint) global_system_variables.net_read_timeout; - net->write_timeout=(uint) global_system_variables.net_write_timeout; - net->retry_count= (uint) global_system_variables.net_retry_count; - net->max_packet_size= max(global_system_variables.net_buffer_length, - global_system_variables.max_allowed_packet); -} -} - -#else /* EMBEDDED_LIBRARY */ -void my_net_local_init(NET *net __attribute__(unused)) -{ -} -#endif /* EMBEDDED_LIBRARY */ /* Return ok to the client. |