diff options
| author | monty@mysql.com <> | 2004-11-08 01:13:54 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-08 01:13:54 +0200 |
| commit | b903a129e26e217cf3c891a604ec1733df8fa9ff (patch) | |
| tree | 7a3852793309c847d2ee83023b9429b28913b390 /sql/repl_failsafe.cc | |
| parent | e93450d4421c3794d569f529b1f123cd3ca2eaf7 (diff) | |
| download | mariadb-git-b903a129e26e217cf3c891a604ec1733df8fa9ff.tar.gz | |
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
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 83fceca80ef..720e82f414e 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -92,7 +92,7 @@ static int init_failsafe_rpl_thread(THD* thd) VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals)); #endif - thd->mem_root.free=thd->mem_root.used=0; + thd->mem_root->free= thd->mem_root->used= 0; if (thd->variables.max_join_size == HA_POS_ERROR) thd->options|= OPTION_BIG_SELECTS; |