Update our Erlang VM requirement to 5.6.5 (R12B5). Also fixes the rem…

…aining two

compiler warnings.



git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@804552 13f79535-47bb-0310-9956-ffa450edef68

configure.ac

@@ -148,7 +148,7 @@ if test x${ERL} = x; then
     AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang installed?])
 fi
 
-erlang_version_error="The installed Erlang version is less than 5.6.0 (R12B)."
+erlang_version_error="The installed Erlang version is less than 5.6.5 (R12B05)."
 
 version="`${ERL} -version 2>&1 | ${SED} "s/[[^0-9]]/ /g"`"
 
@@ -160,6 +160,12 @@ if test `echo $version | ${AWK} "{print \\$2}"` -lt 6; then
     AC_MSG_ERROR([$erlang_version_error])
 fi
 
+if test `echo $version | ${AWK} "{print \\$2}"` -eq 6; then
+    if test `echo $version | ${AWK} "{print \\$3}"` -lt 5; then
+        AC_MSG_ERROR([$erlang_version_error])
+    fi
+fi
+
 AC_PATH_PROG([ERLC], [erlc])
 
 if test x${ERLC} = x; then

src/couchdb/couch_httpd_view.erl

@@ -611,7 +611,7 @@ send_json_reduce_row(Resp, {Key, Value}, RowFront) ->
 view_group_etag(Group, Db) ->
     view_group_etag(Group, Db, nil).
 
-view_group_etag(#group{sig=Sig,current_seq=CurrentSeq}, Db, Extra) ->
+view_group_etag(#group{sig=Sig,current_seq=CurrentSeq}, _Db, Extra) ->
     % ?LOG_ERROR("Group ~p",[Group]),
     % This is not as granular as it could be.
     % If there are updates to the db that do not effect the view index,

src/couchdb/couch_rep_reader.erl

@@ -93,8 +93,8 @@ handle_info({'DOWN', Ref, _, _, Reason}, State) ->
 handle_info({'EXIT', Loop, complete}, #state{reader_loop=Loop} = State) ->
     handle_reader_loop_complete(State).
 
-terminate(Reason, _State) ->
-    % ?LOG_INFO("rep reader terminating with reason ~p", [Reason]),
+terminate(_Reason, _State) ->
+    % ?LOG_INFO("rep reader terminating with reason ~p", [_Reason]),
     ok.
 
 code_change(_OldVsn, State, _Extra) ->