diff options
| author | unknown <miguel@hegel.local> | 2004-05-05 02:59:17 -0300 |
|---|---|---|
| committer | unknown <miguel@hegel.local> | 2004-05-05 02:59:17 -0300 |
| commit | bddee0c170454f54c1f87299d88d3aa9e44a3872 (patch) | |
| tree | acaa682ecb4e7413232120ad5965cc6adc2f410c /sql/item_geofunc.cc | |
| parent | af847c22af26e1cc308eeab08d35942741809408 (diff) | |
| download | mariadb-git-bddee0c170454f54c1f87299d88d3aa9e44a3872.tar.gz | |
Windows fixes for VC++ compiler compability
myisam/myisam_ftdump.c:
VC++ compiler compability fix
mysys/my_getsystime.c:
Applied Sergei's code for Windows (still subject to changes by him)
sql/handler.cc:
VC++ compiler compability fix
sql/item_geofunc.cc:
Removed non-used variable
sql/item_strfunc.cc:
VC++ compiler compability fix
sql/opt_range.cc:
VC++ compiler compability fix
sql/sql_insert.cc:
VC++ compiler compability fix
sql/sql_lex.cc:
VC++ compiler compability fix
sql/sql_parse.cc:
VC++ compiler compability fix
sql/sql_prepare.cc:
VC++ compiler compability fix
sql/sql_union.cc:
Removed non-used variable and VC++ compiler compability fix
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 555c1a74eaf..d95271a54bb 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -697,8 +697,7 @@ longlong Item_func_srid::val_int() DBUG_ASSERT(fixed == 1); String *swkb= args[0]->val_str(&value); Geometry_buffer buffer; - Geometry *geom; - + null_value= (!swkb || !Geometry::create_from_wkb(&buffer, swkb->ptr() + SRID_SIZE, |