Merge pull request #1688 from martin-frbg/issue1673

Temporarily disable special handling of OPENMP thread memory allocation

diff --cc driver/others/memory.c
index a8b76a8,772c1f2..6ac9546
--- 1/driver/others/memory.c
--- 2/driver/others/memory.c
+++ b/driver/others/memory.c
@@@ -494,10 -494,10 +494,10 @@@ static const int allocation_block_size 
  #endif
  
  /* Holds pointers to allocated memory */
- #if defined(SMP) && !defined(USE_OPENMP)
+ #if defined(SMP) && !defined(USE_OPENMP_UNUSED)
  /* This is the number of threads than can be spawned by the server, which is the
     server plus the number of threads in the thread pool */
 -#  define MAX_ALLOCATING_THREADS MAX_CPU_NUMBER * 2 * MAX_PARALLEL_NUMBER +1
 +#  define MAX_ALLOCATING_THREADS MAX_CPU_NUMBER * 2 * MAX_PARALLEL_NUMBER * 2
  static int next_memory_table_pos = 0;
  #  if defined(HAS_COMPILER_TLS)
  /* Use compiler generated thread-local-storage */