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/mysql_priv.h | |
| 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/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 770b7057661..3f55a88b262 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -910,7 +910,7 @@ extern char *default_tz_name; extern MYSQL_LOG mysql_log,mysql_update_log,mysql_slow_log,mysql_bin_log; extern FILE *bootstrap_file; -extern pthread_key(MEM_ROOT*,THR_MALLOC); +extern pthread_key(MEM_ROOT**,THR_MALLOC); extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, LOCK_thread_count,LOCK_mapped_file,LOCK_user_locks, LOCK_status, LOCK_error_log, LOCK_delayed_insert, LOCK_uuid_generator, |