summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-03-26 13:27:36 +0300
committerunknown <monty@donna.mysql.fi>2001-03-26 13:27:36 +0300
commit4bf00b00b74e11b801d6ad4ade5de9a07b88e1cf (patch)
treee9c9fdeab5d0a635045172c211af567c8b6a81b9 /mysys
parent653f620e6f3f416ef327ec85daf1ba4f0654442c (diff)
downloadmariadb-git-4bf00b00b74e11b801d6ad4ade5de9a07b88e1cf.tar.gz
Added test case that crashed Innobase
BUILD/compile-solaris-sparc-purify: Changed to old (easy-to-edit) format extra/resolve_stack_dump.c: Don't require -s and -n options innobase/include/Makefile.i: Applied Heikki's changes innobase/include/univ.i: Applied Heikki's changes innobase/os/os0file.c: Fix problem with Signal 14 on Solaris mysys/mf_qsort.c: Fix for purify sql-bench/Results/ATIS-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/RUN-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/alter-table-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/big-tables-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/connect-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/create-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/insert-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/select-mysql-Linux_2.2.16_SMP_alpha: New test results sql-bench/Results/wisconsin-mysql-Linux_2.2.16_SMP_alpha: New test results sql/ha_gemini.h: Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized. sql/ha_innobase.cc: Merged Heikkis changes sql/ha_innobase.h: Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized. sql/handler.cc: Fixed that SHOW VARIABLES shows table type as disabled if it can't be initialized. sql/mysqld.cc: Cleaned up error warning message.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/mf_qsort.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c
index 15fa5638639..e029e148ddb 100644
--- a/mysys/mf_qsort.c
+++ b/mysys/mf_qsort.c
@@ -37,7 +37,6 @@ along with GNU QSORT; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "mysys_priv.h"
-#if !defined(HAVE_purify) || defined(QSORT_EXTRA_CMP_ARGUMENT)
/* Envoke the comparison function, returns either 0, < 0, or > 0. */
#ifdef QSORT_EXTRA_CMP_ARGUMENT
@@ -123,6 +122,9 @@ qsort_t qsort(void *base_ptr, size_t total_elems, size_t size, qsort_cmp cmp)
stack_node stack[STACK_SIZE]; /* Largest size needed for 32-bit int!!! */
stack_node *top = stack + 1;
char *pivot_buffer = (char *) my_alloca ((int) size);
+#ifdef HAVE_purify
+ stack[0].lo=stack[0].hi=0;
+#endif
while (STACK_NOT_EMPTY)
{
@@ -255,4 +257,3 @@ qsort_t qsort(void *base_ptr, size_t total_elems, size_t size, qsort_cmp cmp)
}
SORT_RETURN;
}
-#endif /* HAVE_purify */