diff options
| author | unknown <monty@mysql.com> | 2004-08-23 13:46:51 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-08-23 13:46:51 +0300 |
| commit | f7d0dfd9e8966a6c4c885ade872273dddd36e228 (patch) | |
| tree | 31ceb8889afc4b529a25bc930d8aa8a41d83ceb2 /sql/sql_select.cc | |
| parent | bf95f9195fe431841fe1e29e6b82c9f47ec52ad3 (diff) | |
| download | mariadb-git-f7d0dfd9e8966a6c4c885ade872273dddd36e228.tar.gz | |
Changed %lx -> 0x%lx (for easier comparison of debug files)
Cosmetic cleanups
Don't call 'delete_elements' on copy_funcs as this causes elements to be freed twice
mysys/hash.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/list.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/mf_iocache.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/mf_keycache.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
Changed debug messages to be more consistent with other mysys files.
mysys/mf_keycaches.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_alloc.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_fopen.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_fstream.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_getwd.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_lib.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_lwrite.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_malloc.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_pread.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_read.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_realloc.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_write.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/safemalloc.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/thr_alarm.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/thr_lock.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/thr_mutex.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/tree.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/typelib.c:
Changed %lx -> 0x%lx (for easier comparison of debug files)
sql/examples/ha_archive.cc:
Changed to return error number for some functions (instead of -1)
Updated function comments & some other minor cleanups
Ensure that free_share() and gzclose() are always called
Use 'TRUE' and 'FALSE' instead of 'true' and 'false'
Removed some compiler warnings
sql/examples/ha_archive.h:
Fixed to use new prototypes for records_in_range
sql/sql_select.cc:
Don't call 'delete_elements' on copy_funcs
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 657853c98ba..d532a189ab6 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3911,7 +3911,11 @@ JOIN::join_free(bool full) if (full) { group_fields.delete_elements(); - tmp_table_param.copy_funcs.delete_elements(); + /* + We can't call delete_elements() on copy_funcs as this will cause + problems in free_elements() as some of the elements are then deleted. + */ + tmp_table_param.copy_funcs.empty(); tmp_table_param.cleanup(); } DBUG_VOID_RETURN; |