mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki 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
commit f403a2967b
7 changed files with 222 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/item_geofunc.cc
View file

@ -34,7 +34,7 @@ String *Item_func_geometry_from_text::val_str(String *str)
uint32 srid;
if ((arg_count == 2) && !args[1]->null_value)
srid= args[1]->val_int();
srid= (uint32)args[1]->val_int();
else
srid= 0;
@ -62,7 +62,7 @@ String *Item_func_geometry_from_wkb::val_str(String *str)
uint32 srid;
if ((arg_count == 2) && !args[1]->null_value)
srid= args[1]->val_int();
srid= (uint32)args[1]->val_int();
else
srid= 0;