diff options
| -rw-r--r-- | include/my_nosys.h | 5 | ||||
| -rw-r--r-- | mysql-test/r/bug46080.result | 18 | ||||
| -rw-r--r-- | mysql-test/suite/maria/t/maria3.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/bug46080-master.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/bug46080.test | 27 | ||||
| -rw-r--r-- | mysys/my_malloc.c | 18 | ||||
| -rw-r--r-- | storage/maria/maria_chk.c | 14 |
7 files changed, 1 insertions, 84 deletions
diff --git a/include/my_nosys.h b/include/my_nosys.h index 96ba6d4c464..93d70a6cfa6 100644 --- a/include/my_nosys.h +++ b/include/my_nosys.h @@ -39,11 +39,6 @@ extern size_t my_quick_read(File Filedes,uchar *Buffer,size_t Count, myf myFlags); extern size_t my_quick_write(File Filedes,const uchar *Buffer,size_t Count); -#if defined(USE_HALLOC) -#define my_malloc(a,b) halloc(a,1) -#define my_no_flags_free(a) hfree(a) -#endif - #endif /* __MY_NOSYS__ */ #ifdef __cplusplus diff --git a/mysql-test/r/bug46080.result b/mysql-test/r/bug46080.result deleted file mode 100644 index 44f6bba8db6..00000000000 --- a/mysql-test/r/bug46080.result +++ /dev/null @@ -1,18 +0,0 @@ -# -# Bug #46080: group_concat(... order by) crashes server when -# sort_buffer_size cannot allocate -# -call mtr.add_suppression("Out of memory at line .*, '.*my_alloc.c'"); -call mtr.add_suppression("needed .* byte (.*k)., memory in use: .* bytes (.*k)"); -CREATE TABLE t1(a CHAR(255)); -INSERT INTO t1 VALUES ('a'); -SET @@SESSION.sort_buffer_size=5*16*1000000; -SET @@SESSION.max_heap_table_size=5*1000000; -Warnings: -Warning 1292 Truncated incorrect max_heap_table_size value: '5000000' -# Must not crash. -SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a; -DROP TABLE t1; -SET @@SESSION.sort_buffer_size=default; -SET @@SESSION.max_heap_table_size=default; -End of 5.0 tests diff --git a/mysql-test/suite/maria/t/maria3.test b/mysql-test/suite/maria/t/maria3.test index 3cf395f66e7..5579afe11e3 100644 --- a/mysql-test/suite/maria/t/maria3.test +++ b/mysql-test/suite/maria/t/maria3.test @@ -257,8 +257,6 @@ update t1 set s1=2 where seq=1; check table t1 extended; drop table t1; -# Fix if we are using safemalloc ---replace_result 8388572 8388600 select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "aria%" and variable_name not like "aria_used_for_temp_tables" order by 1; --replace_column 2 # show status like 'aria%'; diff --git a/mysql-test/t/bug46080-master.opt b/mysql-test/t/bug46080-master.opt deleted file mode 100644 index 7e30ff11644..00000000000 --- a/mysql-test/t/bug46080-master.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-performance-schema=0 --skip-grant-tables --skip-name-resolve --loose-aria-pagecache-buffer-size=1M diff --git a/mysql-test/t/bug46080.test b/mysql-test/t/bug46080.test deleted file mode 100644 index ed824529a9b..00000000000 --- a/mysql-test/t/bug46080.test +++ /dev/null @@ -1,27 +0,0 @@ ---echo # ---echo # Bug #46080: group_concat(... order by) crashes server when ---echo # sort_buffer_size cannot allocate ---echo # - ---source include/have_debug.inc - -call mtr.add_suppression("Out of memory at line .*, '.*my_alloc.c'"); -call mtr.add_suppression("needed .* byte (.*k)., memory in use: .* bytes (.*k)"); - -CREATE TABLE t1(a CHAR(255)); -INSERT INTO t1 VALUES ('a'); - -SET @@SESSION.sort_buffer_size=5*16*1000000; -SET @@SESSION.max_heap_table_size=5*1000000; - ---echo # Must not crash. ---disable_result_log ---error 0,5 -SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a; ---enable_result_log - -DROP TABLE t1; -SET @@SESSION.sort_buffer_size=default; -SET @@SESSION.max_heap_table_size=default; - ---echo End of 5.0 tests diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c index fc2dc98c3c5..2b76af2da33 100644 --- a/mysys/my_malloc.c +++ b/mysys/my_malloc.c @@ -81,23 +81,6 @@ void *my_realloc(void *oldpoint, size_t size, myf my_flags) DBUG_ASSERT(size > 0); if (!oldpoint && (my_flags & MY_ALLOW_ZERO_PTR)) DBUG_RETURN(my_malloc(size, my_flags)); -#ifdef USE_HALLOC - if (!(point = malloc(size))) - { - if (my_flags & MY_FREE_ON_ERROR) - my_free(oldpoint); - if (my_flags & MY_HOLD_ON_ERROR) - DBUG_RETURN(oldpoint); - my_errno=errno; - if (my_flags & MY_FAE+MY_WME) - my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),size); - } - else - { - memcpy(point,oldpoint,size); - free(oldpoint); - } -#else if ((point= realloc(oldpoint, size)) == NULL) { if (my_flags & MY_FREE_ON_ERROR) @@ -108,7 +91,6 @@ void *my_realloc(void *oldpoint, size_t size, myf my_flags) if (my_flags & (MY_FAE+MY_WME)) my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG), size); } -#endif DBUG_PRINT("exit",("ptr: %p", point)); DBUG_RETURN(point); } diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index 8de969b9b07..41e15018e3e 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -202,7 +202,7 @@ enum options_mc { OPT_SORT_KEY_BLOCKS, OPT_DECODE_BITS, OPT_FT_MIN_WORD_LEN, OPT_FT_MAX_WORD_LEN, OPT_FT_STOPWORD_FILE, OPT_MAX_RECORD_LENGTH, OPT_AUTO_CLOSE, OPT_STATS_METHOD, OPT_TRANSACTION_LOG, - OPT_SKIP_SAFEMALLOC, OPT_ZEROFILL_KEEP_LSN, OPT_REQUIRE_CONTROL_FILE, + OPT_ZEROFILL_KEEP_LSN, OPT_REQUIRE_CONTROL_FILE, OPT_LOG_DIR, OPT_DATADIR, OPT_WARNING_FOR_WRONG_TRANSID }; @@ -322,13 +322,6 @@ static struct my_option my_long_options[] = {"silent", 's', "Only print errors. One can use two -s to make aria_chk very silent.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, -#ifndef DBUG_OFF -#ifdef SAFEMALLOC - {"skip-safemalloc", OPT_SKIP_SAFEMALLOC, - "Don't use the memory allocation checking.", 0, 0, 0, GET_NO_ARG, NO_ARG, - 0, 0, 0, 0, 0, 0}, -#endif -#endif {"sort-index", 'S', "Sort index blocks. This speeds up 'read-next' in applications.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, @@ -774,11 +767,6 @@ get_one_option(int optid, DBUG_SET_INITIAL(argument ? argument : "d:t:o,/tmp/aria_chk.trace"); opt_debug= 1; break; - case OPT_SKIP_SAFEMALLOC: -#ifdef SAFEMALLOC - sf_malloc_quick=1; -#endif - break; case 'V': print_version(); exit(0); |