From 19707dc7caa6b969177c916077fca5482810a0d7 Mon Sep 17 00:00:00 2001
From: Michael Kolupaev <mkolupaev@yandex-team.ru>
Date: Mon, 11 Feb 2013 11:42:36 +0000
Subject: [PATCH] Merge

---
 dbms/include/DB/Storages/StorageChunks.h | 2 +-
 dbms/src/Storages/StorageChunks.cpp      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dbms/include/DB/Storages/StorageChunks.h b/dbms/include/DB/Storages/StorageChunks.h
index aa47d34f456..653aa7a79cc 100644
--- a/dbms/include/DB/Storages/StorageChunks.h
+++ b/dbms/include/DB/Storages/StorageChunks.h
@@ -76,7 +76,7 @@ private:
 	void dropThis();
 	
 	void loadIndex();
-	void appendChunkToIndex(const std::string & name, size_t mark);
+	void appendChunkToIndex(const std::string & chunk_name, size_t mark);
 };
 	
 }
diff --git a/dbms/src/Storages/StorageChunks.cpp b/dbms/src/Storages/StorageChunks.cpp
index 801fd76a71d..dda110e2016 100644
--- a/dbms/src/Storages/StorageChunks.cpp
+++ b/dbms/src/Storages/StorageChunks.cpp
@@ -109,11 +109,11 @@ void StorageChunks::loadIndex()
 	}
 }
 
-void StorageChunks::appendChunkToIndex(const std::string & name, size_t mark)
+void StorageChunks::appendChunkToIndex(const std::string & chunk_name, size_t mark)
 {
 	String index_path = path + escapeForFileName(name) + "/chunks.chn";
 	WriteBufferFromFile index(index_path, 4096, O_APPEND | O_CREAT | O_WRONLY);
-	writeStringBinary(name, index);
+	writeStringBinary(chunk_name, index);
 	writeIntBinary<UInt64>(mark, index);
 }