Simpler arena swapping code

Now thd->mem_root is a pointer to thd->main_mem_root and THR_MALLOC is a pointer to thd->mem_root.
This gives us the following benefits:
- Allow us to easily detect if arena has already been swapped before (this fixes a bug in setup_conds() where arena was swaped twice in some cases)
- Faster swaps of arenas (as we don't have to copy the whole MEM_ROOT)
- We don't anymore have to call my_pthread_setspecific_ptr(THR_MALLOC,...) to change where memory is alloced. Now it's enough to set thd->mem_root

1 files changed, 0 insertions, 8 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index df80fc7bb66..a207da21af5 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -949,11 +949,7 @@ static void do_exec(struct st_query* q)
     while (fgets(buf, sizeof(buf), res_file))
       replace_dynstr_append_mem(ds, buf, strlen(buf));
   }
-#ifndef __WIN__
   error= pclose(res_file);
-#else  
-  error= _pclose(res_file);
-#endif  
 
   if (error != 0)
     die("command \"%s\" failed", cmd);
@@ -4610,11 +4606,7 @@ FILE *my_popen(const char *cmd, const char *mode __attribute__((unused)))
   FILE *res_file;
 
   subst_cmd= subst_env_var(cmd);
-#ifndef __WIN__
   res_file= popen(subst_cmd, "r0");
-#else
-  res_file= _popen(subst_cmd, "r0");
-#endif
   my_free(subst_cmd, MYF(0));
   return res_file;
 }