mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
This commit is contained in:
unknown 2003-09-10 10:25:29 +03:00
commit 8f2c275746
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libmysqld/lib_sql.cc
View file

@ -80,10 +80,8 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
if ((net->last_errno= thd->net.last_errno)) if ((net->last_errno= thd->net.last_errno))
{ {
memcpy(net->last_error, net->last_error, memcpy(net->last_error, thd->net.last_error, sizeof(net->last_error));
sizeof(net->last_error)); memcpy(net->sqlstate, thd->net.sqlstate, sizeof(net->sqlstate));
memcpy(net->sqlstate, thd->net.sqlstate,
sizeof(net->sqlstate));
} }
mysql->warning_count= ((THD*)mysql->thd)->total_warn_count; mysql->warning_count= ((THD*)mysql->thd)->total_warn_count;
return result; return result;
@ -482,15 +480,16 @@ bool Protocol_simple::store_null()
bool Protocol::net_store_data(const char *from, uint length) bool Protocol::net_store_data(const char *from, uint length)
{ {
if (!(*next_field=alloc_root(alloc, length + 1))) char *field_buf;
if (!(field_buf=alloc_root(alloc, length + sizeof(uint))))
return true; return true;
*(uint *)field_buf= length;
*next_field= field_buf + sizeof(uint);
memcpy(*next_field, from, length); memcpy(*next_field, from, length);
(*next_field)[length]= 0;
if (next_mysql_field->max_length < length) if (next_mysql_field->max_length < length)
next_mysql_field->max_length=length; next_mysql_field->max_length=length;
++next_field; ++next_field;
++next_mysql_field; ++next_mysql_field;
return false; return false;
} }

4
libmysqld/libmysqld.c
View file

@ -176,9 +176,7 @@ static void STDCALL emb_fetch_lengths(ulong *to, MYSQL_ROW column, uint field_co
MYSQL_ROW end; MYSQL_ROW end;
for (end=column + field_count; column != end ; column++,to++) for (end=column + field_count; column != end ; column++,to++)
{ *to= *column ? *(uint *)((*column) - sizeof(uint)) : 0;
*to= *column ? strlen(*column) : 0;
}
} }