diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-07-07 21:30:51 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-07-07 21:30:51 +0500 |
| commit | e182ae27cd11548feeb59306799aea3c342e8af9 (patch) | |
| tree | 9350a729223937346837c3628be4460c568db80b /sql/item_geofunc.cc | |
| parent | 13f6e1119f831ecde5a8e82e8a68f2848b2b54a1 (diff) | |
| download | mariadb-git-e182ae27cd11548feeb59306799aea3c342e8af9.tar.gz | |
Fix for bug #805860 Second assertion Assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sincos.
Just typo-style mistake. Should be '||' instead of '&&'.
per-file comments:
mysql-test/r/gis-precise.result
Fix for bug #805860 Second assertion Assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sincos.
test result updated.
mysql-test/t/gis-precise.test
Fix for bug #805860 Second assertion Assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sincos.
test case added.
sql/item_geofunc.cc
Fix for bug #805860 Second assertion Assertion `n > 0 && n < SINUSES_CALCULATED*2+1' in get_n_sincos.
condition fixed.
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index b1fe72e99e0..4afc56eaf87 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -1395,7 +1395,7 @@ int Item_func_buffer::Transporter::complete() } else { - if (x2 != x00 && y2 != y00) + if (x2 != x00 || y2 != y00) { if (add_edge_buffer(x00, y00, false, false)) return 1; |