Commit 5c8b5f21 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_func.cc:
  Auto merged
parents 7a3c7a7f 0989e1af

BUILD/compile-pentium-debug

+1 −1
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

mysql-test/r/func_misc.result

+21 −0
Original line number Diff line number Diff line
@@ -28,3 +28,24 @@ length(format('nan', 2)) > 0 
select concat("$",format(2500,2));

concat("$",format(2500,2))

$2,500.00

create table t1 ( a timestamp );

insert into t1 values ( '2004-01-06 12:34' );

select a from t1 where left(a+0,6) in ( left(20040106,6) );

a

2004-01-06 12:34:00

select a from t1 where left(a+0,6) = ( left(20040106,6) );

a

2004-01-06 12:34:00

select a from t1 where right(a+0,6) in ( right(20040106123400,6) );

a

2004-01-06 12:34:00

select a from t1 where right(a+0,6) = ( right(20040106123400,6) );

a

2004-01-06 12:34:00

select a from t1 where mid(a+0,6,3) in ( mid(20040106123400,6,3) );

a

2004-01-06 12:34:00

select a from t1 where mid(a+0,6,3) = ( mid(20040106123400,6,3) );

a

2004-01-06 12:34:00

drop table t1;

mysql-test/t/func_misc.test

+15 −0
Original line number Diff line number Diff line
@@ -23,3 +23,18 @@ select length(format('nan', 2)) > 0; 
# Test for bug #628

#

select concat("$",format(2500,2));



# Test for BUG#7716

create table t1 ( a timestamp );

insert into t1 values ( '2004-01-06 12:34' );

select a from t1 where left(a+0,6) in ( left(20040106,6) );

select a from t1 where left(a+0,6) = ( left(20040106,6) );



select a from t1 where right(a+0,6) in ( right(20040106123400,6) );

select a from t1 where right(a+0,6) = ( right(20040106123400,6) );



select a from t1 where mid(a+0,6,3) in ( mid(20040106123400,6,3) );

select a from t1 where mid(a+0,6,3) = ( mid(20040106123400,6,3) );



drop table t1;

mysys/my_alloc.c

+4 −2
Original line number Diff line number Diff line
@@ -166,7 +166,8 @@ gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size) 
  gptr point;

  reg1 USED_MEM *next= 0;

  reg2 USED_MEM **prev;



  DBUG_ENTER("alloc_root");

  DBUG_PRINT("enter",("root: 0x%lx", mem_root));

  DBUG_ASSERT(alloc_root_inited(mem_root));



  Size= ALIGN_SIZE(Size);
@@ -213,7 +214,8 @@ gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size) 
    mem_root->used= next;

    mem_root->first_block_usage= 0;

  }

  return(point);

  DBUG_PRINT("exit",("ptr: 0x%lx", (ulong) point));

  DBUG_RETURN(point);

#endif

}