database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Fix windows build after applyiing the changes from new client.c(sql-common)

Browse Source 
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
This commit is contained in:
unknown
2003-06-03 20:59:32 -07:00
parent ff820c2724
commit f403a2967b
7 changed files with 222 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_help.cc
View File

@ -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)) ||