summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul@ice.snake.net <>2003-06-11 16:27:26 -0500
committerpaul@ice.snake.net <>2003-06-11 16:27:26 -0500
commit38268be444866e067e6a5196435d40c1fdf33415 (patch)
treec2d0186deda54fd98db7c63d5a410b266a39efc2
parent4b2fa4ea221b030efceda638b530ee0029169710 (diff)
downloadmariadb-git-38268be444866e067e6a5196435d40c1fdf33415.tar.gz
ft_update.c:
Fix parse error per serg instructions.
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--myisam/ft_update.c14
2 files changed, 13 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 202f30dd31e..806eac52759 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -77,6 +77,7 @@ nick@mysql.com
nick@nick.leippe.com
papa@gbichot.local
paul@central.snake.net
+paul@ice.snake.net
paul@teton.kitebird.com
pem@mysql.com
peter@linux.local
diff --git a/myisam/ft_update.c b/myisam/ft_update.c
index 365fe0d98e3..cdf3b306087 100644
--- a/myisam/ft_update.c
+++ b/myisam/ft_update.c
@@ -64,8 +64,18 @@ uint _mi_ft_segiterator(register FT_SEG_ITERATOR *ftsi)
{
DBUG_ENTER("_mi_ft_segiterator");
- if (!ftsi->num) DBUG_RETURN(0) else ftsi->num--;
- if (!ftsi->seg) DBUG_RETURN(1) else ftsi->seg--;
+ if (!ftsi->num)
+ {
+ DBUG_RETURN(0);
+ }
+ else
+ ftsi->num--;
+ if (!ftsi->seg)
+ {
+ DBUG_RETURN(1);
+ }
+ else
+ ftsi->seg--;
if (ftsi->seg->null_bit &&
(ftsi->rec[ftsi->seg->null_pos] & ftsi->seg->null_bit))