Merge branch 'master' into 4.x and some warning fixes

src/server/shared/DataStores/DB2FileLoader.cpp

@@ -370,9 +370,6 @@ char* DB2FileLoader::AutoProduceStrings(const char* format, char* dataTable)
     if (strlen(format) != fieldCount)
         return NULL;
 
-    // each string field at load have array of string for each locale
-    size_t stringHolderSize = sizeof(char*) * TOTAL_LOCALES;
-
     char* stringPool= new char[stringSize];
     memcpy(stringPool, stringTable, stringSize);
 
@@ -408,4 +405,4 @@ char* DB2FileLoader::AutoProduceStrings(const char* format, char* dataTable)
     }
 
     return stringPool;
-}
+}