diff options
| author | unknown <venu@myvenu.com> | 2003-06-03 20:59:32 -0700 |
|---|---|---|
| committer | unknown <venu@myvenu.com> | 2003-06-03 20:59:32 -0700 |
| commit | 0c55e8f6276e3cfa6baa9a1a18038d563a8d72e0 (patch) | |
| tree | 0c63a76e645bd17fa2e854c9d6e3b91d1d0a7b78 /sql/sql_help.cc | |
| parent | 217de5795c742255bd5e2b4e74013a2df45607bd (diff) | |
| download | mariadb-git-0c55e8f6276e3cfa6baa9a1a18038d563a8d72e0.tar.gz | |
Fix windows build after applyiing the changes from new client.c(sql-common)
NOTE: Still the build fails to compile core server on Windows due to slave_net_timeout linker error from client.obj
and make sure to have the next changeset, which fixes this.
sql/item_geofunc.cc:
Fix warnings
sql/sql_help.cc:
Fix compiler errors
sql-common/client.c:
Delete and move redefination of shared memory stuff
libmysql/libmysql.c:
Fix for redefination stuff from client.c
VC++Files/client/mysqlclient.dsp:
add client.c
VC++Files/libmysql/libmysql.dsp:
add client.c
VC++Files/sql/mysqld.dsp:
add client.c and remove old convert.cpp and mini_client.c
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index 2925141d331..9003d4b36cd 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -224,7 +224,7 @@ int search_keyword(THD *thd, TABLE *keywords, struct st_find_field *find_fields, if (!select->cond->val_int()) // Dosn't match like continue; - *key_id= find_fields[help_keyword_help_keyword_id].field->val_int(); + *key_id= (int)find_fields[help_keyword_help_keyword_id].field->val_int(); count++; } @@ -556,13 +556,12 @@ int send_variant_2_list(MEM_ROOT *mem_root, Protocol *protocol, String **pos= pointers; List_iterator<String> it(*names); - String *cur_name; while ((*pos++= it++)); qsort(pointers,names->elements,sizeof(String*),string_ptr_cmp); String **end= pointers + names->elements; - for (String **pos= pointers; pos!=end; pos++) + for (pos= pointers; pos!=end; pos++) { protocol->prepare_for_resend(); if (source_name) @@ -688,8 +687,8 @@ int mysqld_help(THD *thd, const char *mask) res= -1; goto end; } - - for (size_t i=0; i<sizeof(tables)/sizeof(TABLE_LIST); i++) + size_t i; + for (i=0; i<sizeof(tables)/sizeof(TABLE_LIST); i++) tables[i].table->file->init_table_handle_for_HANDLER(); if (!(select_topics_by_name= @@ -739,9 +738,9 @@ int mysqld_help(THD *thd, const char *mask) { Field *topic_cat_id= used_fields[help_topic_help_category_id].field; Item *cond_topic_by_cat= new Item_func_equal(new Item_field(topic_cat_id), - new Item_int(category_id)); + new Item_int((int32)category_id)); Item *cond_cat_by_cat= new Item_func_equal(new Item_field(cat_cat_id), - new Item_int(category_id)); + new Item_int((int32)category_id)); if (!(select_topics_by_cat= prepare_simple_select(thd,cond_topic_by_cat, tables,tables[0].table, &error)) || |