summaryrefslogtreecommitdiff
path: root/storage/mroonga
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2015-05-16 18:00:32 +0300
committerSergei Golubchik <serg@mariadb.org>2015-10-05 17:14:13 +0200
commit7e3127966646bca50ae6b8ba44c9aed0a261c482 (patch)
treece0a0484e18263ff6e9efe34e491391531439704 /storage/mroonga
parentb2b07b33cf55b39db87a00789936113cc290f678 (diff)
downloadmariadb-git-7e3127966646bca50ae6b8ba44c9aed0a261c482.tar.gz
Speed up some innodb tests
Fixed compiler warnings sql/sql_view.cc: Ensure that merged_for_insert is properly reset (Left of an old patch)
Diffstat (limited to 'storage/mroonga')
-rw-r--r--storage/mroonga/vendor/groonga/lib/operator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/mroonga/vendor/groonga/lib/operator.c b/storage/mroonga/vendor/groonga/lib/operator.c
index e57408e0081..1fc463eb00d 100644
--- a/storage/mroonga/vendor/groonga/lib/operator.c
+++ b/storage/mroonga/vendor/groonga/lib/operator.c
@@ -352,7 +352,7 @@ grn_operator_exec_equal(grn_ctx *ctx, grn_obj *x, grn_obj *y)
grn_bool
grn_operator_exec_not_equal(grn_ctx *ctx, grn_obj *x, grn_obj *y)
{
- grn_bool r;
+ grn_bool r= 0;
GRN_API_ENTER;
DO_EQ(x, y, r);
GRN_API_RETURN(!r);