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 | f403a2967b85c1898e4d7c97c185601cfb2c4a33 (patch) | |
| tree | 0c63a76e645bd17fa2e854c9d6e3b91d1d0a7b78 /sql/item_geofunc.cc | |
| parent | ff820c2724e01072db4d5e5c8e56cd4608c9ddb8 (diff) | |
| download | mariadb-git-f403a2967b85c1898e4d7c97c185601cfb2c4a33.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/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index fa858922c1b..6db139fdfa6 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -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; |