diff options
| author | unknown <venu@myvenu.com> | 2003-02-20 14:14:37 -0800 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-02-20 14:14:37 -0800 |
| commit | b0f2c7e54a1a18f71f0a6b5d5e552f6d5d100fe5 (patch) | |
| tree | 5acab851085621a0ba8465cb1069b4dc1e3377cc /sql/sql_help.cc | |
| parent | e9b3a3129cc63eed0ed155f1534aef29241b4918 (diff) | |
| download | mariadb-git-b0f2c7e54a1a18f71f0a6b5d5e552f6d5d100fe5.tar.gz | |
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
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index 24ea2e9734e..def36665fb5 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -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, |