Commit e2f1950c authored by salle@geopard.(none)'s avatar salle@geopard.(none)
Browse files

Merge akeremidarski@work.mysql.com:/home/bk/mysql 

into geopard.(none):/storage/bk/mysql-3.23
parents 8161ec4c 57152522

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

mysql-test/r/merge.result

+6 −0
Original line number Diff line number Diff line
@@ -130,3 +130,9 @@ a 
a	b

1	1

1	2

a

1

2

a

1

2

mysql-test/t/merge.test

+19 −0
Original line number Diff line number Diff line
@@ -114,3 +114,22 @@ insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6); 
flush tables;

select * from t3 where a=1 order by b limit 2;

drop table t3,t1,t2;



#

# temporary merge tables

#

drop table if exists t1, t2, t3, t4, t5, t6;

create table t1 (a int not null);

create table t2 (a int not null);

insert into t1 values (1);

insert into t2 values (2);

create temporary table t3 (a int not null) TYPE=MERGE UNION=(t1,t2);

select * from t3;

create temporary table t4 (a int not null);

create temporary table t5 (a int not null);

insert into t4 values (1);

insert into t5 values (2);

create temporary table t6 (a int not null) TYPE=MERGE UNION=(t4,t5);

select * from t6;

drop table if exists t1, t2, t3, t4, t5, t6;

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);