Merge work:/home/bk/mysql

into sergbook.mysql.com:/usr/home/serg/Abk/mysql

6 files changed, 20 insertions, 3 deletions

diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium-valgrind-max
new file mode 100755
index 00000000000..d58ee723aee
--- /dev/null
+++ b/BUILD/compile-pentium-valgrind-max
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+path=`dirname $0`
+. "$path/SETUP.sh"
+
+extra_flags="$pentium_cflags $debug_cflags -DHAVE_purify"
+c_warnings="$c_warnings $debug_extra_warnings"
+cxx_warnings="$cxx_warnings $debug_extra_warnings"
+extra_configs="$pentium_configs $debug_configs"
+
+extra_configs="$extra_configs"
+
+. "$path/FINISH.sh"
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 2314c51a92a..7291abae07e 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -46930,6 +46930,8 @@ not yet 100% confident in this code.
 @appendixsubsec Changes in release 3.23.54
 @itemize
 @item
+Fixed that @code{--core-file} works on Linux (at least on kernel 2.4.18).
+@item
 Fixed a problem with BDB and @code{ALTER TABLE}.
 @item
 Fixed reference to freed memory when doing complicated @code{GROUP BY
diff --git a/sql/field.h b/sql/field.h
index 92e098c75c4..e822f6a71d6 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -533,7 +533,6 @@ public:
   enum Item_result result_type () const { return field_length == 8 || field_length == 14 ? INT_RESULT : STRING_RESULT; }
   enum_field_types type() const { return FIELD_TYPE_TIMESTAMP;}
   enum ha_base_keytype key_type() const { return HA_KEYTYPE_ULONG_INT; }
-  enum Item_result cmp_type () const { return INT_RESULT; }
   void store(const char *to,uint length);
   void store(double nr);
   void store(longlong nr);
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 4650b770299..36ecde337a7 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -354,7 +354,6 @@ void Item_func_between::fix_length_and_dec()
   if (args[0]->type() == FIELD_ITEM)
   {
     Field *field=((Item_field*) args[0])->field;
-    cmp_type=field->cmp_type();
     if (field->store_for_compare())
     {
       if (convert_constant_item(field,&args[1]))
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index f7be5525e34..71b832f24f4 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1326,7 +1326,11 @@ information that should help you find out what is causing the crash\n");
 #endif /* HAVE_STACKTRACE */
 
  if (test_flags & TEST_CORE_ON_SIGNAL)
+ {
+   fprintf(stderr, "Writing a core file\n");
+   fflush(stderr);
    write_core(sig);
+ }
  exit(1);
 }
 
diff --git a/sql/stacktrace.c b/sql/stacktrace.c
index f4415571f1b..d5711bcd78e 100644
--- a/sql/stacktrace.c
+++ b/sql/stacktrace.c
@@ -206,7 +206,7 @@ resolve it\n");
 
 /* Produce a core for the thread */
 
-#ifdef HAVE_LINUXTHREADS
+#ifdef NOT_USED /* HAVE_LINUXTHREADS */
 void write_core(int sig)
 {
   signal(sig, SIG_DFL);