Commit 3b604387 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
parents 97b08214 f8e45de3

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ dlenev@build.mysql.com 
dlenev@jabberwock.localdomain

dlenev@mysql.com

ejonore@mc03.ndb.mysql.com

evgen@moonbone.(none)

evgen@moonbone.local

gbichot@quadita2.mysql.com

gbichot@quadxeon.mysql.com

georg@beethoven.local

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -609,6 +609,7 @@ extern uint dirname_part(my_string to,const char *name); 
extern uint dirname_length(const char *name);

#define base_name(A) (A+dirname_length(A))

extern int test_if_hard_path(const char *dir_name);

extern my_bool has_path(const char *name);

extern char *convert_dirname(char *to, const char *from, const char *from_end);

extern void to_unix_path(my_string name);

extern my_string fn_ext(const char *name);

myisam/myisampack.c

+7 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define __GNU_LIBRARY__			/* Skip warnings in getopt.h */

#endif

#include <my_getopt.h>

#include <assert.h>



#if INT_MAX > 32767

#define BITS_SAVED 32
@@ -1991,7 +1992,9 @@ static void write_bits (register ulong value, register uint bits) 
  {

    reg3 uint byte_buff;

    bits= (uint) -file_buffer.bits;

    byte_buff=file_buffer.current_byte | (uint) (value >> bits);

    DBUG_ASSERT(bits <= 8 * sizeof(value));

    byte_buff= (file_buffer.current_byte |

               ((bits != 8 * sizeof(value)) ? (uint) (value >> bits) : 0));

#if BITS_SAVED == 32

    *file_buffer.pos++= (byte) (byte_buff >> 24) ;

    *file_buffer.pos++= (byte) (byte_buff >> 16) ;
@@ -1999,7 +2002,9 @@ static void write_bits (register ulong value, register uint bits) 
    *file_buffer.pos++= (byte) (byte_buff >> 8) ;

    *file_buffer.pos++= (byte) byte_buff;



    value&=(1 << bits)-1;

    DBUG_ASSERT(bits <= 8 * sizeof(ulong));

    if (bits != 8 * sizeof(value))

      value&= (((ulong) 1) << bits) - 1;

#if BITS_SAVED == 16

    if (bits >= sizeof(uint))

    {

myisammrg/myrg_open.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) 
      continue;		/* Skip comments */

    }



    if (!test_if_hard_path(buff))

    if (!has_path(buff))

    {

      VOID(strmake(name_buff+dir_length,buff,

                   sizeof(name_buff)-1-dir_length));

mysql-test/r/group_by.result

+9 −0
Original line number Diff line number Diff line
@@ -702,3 +702,12 @@ c 
val-74

val-98

drop table t1,t2;

create table t1 (b int4 unsigned not null);

insert into t1 values(3000000000);

select * from t1;

b

3000000000

select min(b) from t1;

min(b)

3000000000

drop table t1;