mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +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:
@ -102,7 +102,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
|
||||
|
||||
static MYSQL_DATA * STDCALL
|
||||
emb_read_rows(MYSQL *mysql, MYSQL_FIELD *mysql_fields __attribute__((unused)),
|
||||
uint fields __attribute__((unused)))
|
||||
unsigned int fields __attribute__((unused)))
|
||||
{
|
||||
MYSQL_DATA *result= ((THD*)mysql->thd)->data;
|
||||
if (!result)
|
||||
@ -154,7 +154,7 @@ static my_bool STDCALL emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
|
||||
else the lengths are calculated from the offset between pointers.
|
||||
**************************************************************************/
|
||||
|
||||
static void STDCALL emb_fetch_lengths(ulong *to, MYSQL_ROW column, uint field_count)
|
||||
static void STDCALL emb_fetch_lengths(ulong *to, MYSQL_ROW column, unsigned int field_count)
|
||||
{
|
||||
MYSQL_ROW end;
|
||||
|
||||
|
Reference in New Issue
Block a user