diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-13 15:05:57 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-13 15:05:57 +0200 |
| commit | ffb0cd6146662705491e1461a7727c9627f9bd15 (patch) | |
| tree | 61bb2af855b23d9486e1aec670de13c42b27c772 /sql/ha_partition.cc | |
| parent | b78f6240448c3e53ae60549483eb78225a5edc34 (diff) | |
| download | mariadb-git-ffb0cd6146662705491e1461a7727c9627f9bd15.tar.gz | |
When compiling with valgrind, change my_alloca() to use my_malloc()
- This allows us to detect missing my_afree() calls and also find overruns (when running with valgrind) to alloca() areas.
- Added missing my_afree() calls
- Fixed wrong call to my_afree()
include/my_sys.h:
When compiling with valgrind, change my_alloca() to use my_malloc()
mysql-test/suite/innodb/t/innodb_bug57255.test:
Speed up taste case (patch from Stewart Smith)
mysql-test/suite/innodb_plugin/t/innodb_bug57255.test:
Speed up taste case (patch from Stewart Smith)
sql/ha_partition.cc:
Removed casts from my_afree()
sql/opt_range.cc:
Add missing my_afree() calls.
storage/maria/ma_rt_split.c:
Fixed wrong parameter to my_afree()
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index e2ad4b4462c..1e462130a32 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -2432,7 +2432,7 @@ bool ha_partition::get_from_handler_file(const char *name, MEM_ROOT *mem_root) for (i= 0; i < m_tot_parts; i++) m_engine_array[i]= ha_lock_engine(NULL, engine_array[i]); - my_afree((gptr) engine_array); + my_afree(engine_array); if (!m_file && create_handlers(mem_root)) { @@ -2442,7 +2442,7 @@ bool ha_partition::get_from_handler_file(const char *name, MEM_ROOT *mem_root) DBUG_RETURN(FALSE); err3: - my_afree((gptr) engine_array); + my_afree(engine_array); err2: my_free(file_buffer, MYF(0)); err1: |