mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
SCRUM
embedded library some dirty places cleaned: uint removed from mysql.h as Miguel suggested empty_string renamed as my_empty_string to get rid of name's intersections using embedded library include/mysql.h: uint -> unsigned int include/mysql_com.h: this caused warnings when not in expression libmysqld/lib_sql.cc: uint -> unsigned int sql-common/client.c: uint -> unsigned int sql/item_strfunc.cc: empty_string -> my_empty_string sql/mysql_priv.h: empty_string -> my_empty_string sql/set_var.cc: empty_string -> my_empty_string sql/sql_class.cc: empty_string -> my_empty_string sql/sql_prepare.cc: net_flush ifdef-ed
This commit is contained in:
@@ -1008,7 +1008,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
|
||||
else the lengths are calculated from the offset between pointers.
|
||||
**************************************************************************/
|
||||
|
||||
static void STDCALL cli_fetch_lengths(ulong *to, MYSQL_ROW column, uint field_count)
|
||||
static void STDCALL cli_fetch_lengths(ulong *to, MYSQL_ROW column, unsigned int field_count)
|
||||
{
|
||||
ulong *prev_length;
|
||||
byte *start=0;
|
||||
@@ -1140,7 +1140,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
|
||||
/* Read all rows (fields or data) from server */
|
||||
|
||||
MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
|
||||
uint fields)
|
||||
unsigned int fields)
|
||||
{
|
||||
uint field;
|
||||
ulong pkt_len;
|
||||
|
||||
Reference in New Issue
Block a user