mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM
strings/strto.c: Windows won't compile for a wrong argument passing, expects a charset pointer sql/filesort.cc: Remove unused variable sql/lex.h: Change POINT->POINT_SYM due to redefination error from windef.h sql/mysqld.cc: Fix Embedded Server related code sql/protocol.cc: Remove unused variables from Embedded Server sql/sql_class.h: Remove silly usage sql/sql_derived.cc: Windows won't let you compile for this kind of assignments sql/sql_help.cc: Need a cast to make it compile sql/sql_parse.cc: Remove unused variables from Embedded server sql/sql_yacc.yy: Change POINT->POINT_SYM due to redefination error from windef.h mysys/mf_keycache.c: Add a correct cast and remove the unused variables libmysqld/lib_sql.cc: Remove unused variable libmysqld/libmysqld.c: Port the netware change to remove mysql_once_init to libmysqld
This commit is contained in:
@ -254,7 +254,7 @@ int get_all_topics_for_category(THD *thd, TABLE *topics, TABLE *relations,
|
||||
rcat_id->get_key_image(buff, rcat_id->pack_length(), help_charset,
|
||||
Field::itRAW);
|
||||
int key_res= relations->file->index_read(relations->record[0],
|
||||
buff, rcat_id->pack_length(),
|
||||
(byte *)buff, rcat_id->pack_length(),
|
||||
HA_READ_KEY_EXACT);
|
||||
|
||||
for ( ; !key_res && cat_id == (int16) rcat_id->val_int() ;
|
||||
@ -267,7 +267,7 @@ int get_all_topics_for_category(THD *thd, TABLE *topics, TABLE *relations,
|
||||
field->get_key_image(topic_id_buff, field->pack_length(), help_charset,
|
||||
Field::itRAW);
|
||||
|
||||
if (!topics->file->index_read(topics->record[0], topic_id_buff,
|
||||
if (!topics->file->index_read(topics->record[0], (byte *)topic_id_buff,
|
||||
field->pack_length(),
|
||||
HA_READ_KEY_EXACT))
|
||||
res->push_back(get_field(&thd->mem_root,
|
||||
|
Reference in New Issue
Block a user