Commit 57152522 authored by serg@sergbook.mysql.com's avatar serg@sergbook.mysql.com
Browse files

Merge work:/home/bk/mysql 

into sergbook.mysql.com:/usr/home/serg/Abk/mysql
parents 27d07047 537f1c2f

BUILD/compile-pentium-valgrind-max

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /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"

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -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

sql/field.h

+0 −1
Original line number Diff line number Diff line
@@ -533,7 +533,6 @@ class Field_timestamp :public Field_num { 
  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);

sql/item_cmpfunc.cc

+0 −1
Original line number Diff line number Diff line
@@ -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]))

sql/mysqld.cc

+4 −0
Original line number Diff line number Diff line
@@ -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);

}