Commit 36a14aac authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

merge

parents fcb7292e b4ec9cf6

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ int main() 
    [USE_PSTACK=$withval],

    [USE_PSTACK=yes])

  pstack_libs= pstack_dirs=

  if test "$USE_PSTACK" = yes

  if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$MACHINE_TYPE" = "i386"

  then

    have_libiberty= have_libbfd=

    my_save_LIBS="$LIBS"

mysql-test/t/merge.test

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ insert into t2 select NULL,message from t1; 
insert into t1 select NULL,message from t2;

insert into t2 select NULL,message from t1;

insert into t1 select NULL,message from t2;

create table t3 (a int not null, b char(20), key(a)) type=MERGE UNION=(t1,t2);

create table t3 (a int not null, b char(20), key(a)) type=MERGE UNION=(test.t1,test.t2);

explain select * from t3 where a < 10;

explain select * from t3 where a > 10 and a < 20;

select * from t3 where a = 10;

mysys/mf_qsort.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ qsort_t qsort(void *base_ptr, size_t count, size_t size, qsort_cmp cmp) 
  stack_ptr = stack + 1;

#ifdef HAVE_purify

  /* The first element in the stack will be accessed for the last POP */

  stack[0].lo=stack[0].hi=0;

  stack[0].low=stack[0].high=0;

#endif

  pivot = (char *) my_alloca((int) size);

  ptr_cmp= size == sizeof(char*) && !((low - (char*) 0)& (sizeof(char*)-1));

mysys/my_dup.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
File my_dup(File file, myf MyFlags)

{

  File fd;

  char *filename;

  const char *filename;

  DBUG_ENTER("my_dup");

  DBUG_PRINT("my",("file: %d  MyFlags: %d", MyFlags));

  fd = dup(file);

mysys/raid.cc

+2 −2
Original line number Diff line number Diff line
@@ -420,8 +420,8 @@ IsRaid(File fd) 
RaidFd::

RaidFd(uint raid_type, uint raid_chunks, ulong raid_chunksize)

  :_raid_type(raid_type), _raid_chunks(raid_chunks),

   _raid_chunksize(raid_chunksize), _position(0), _fd_vector(0),

   _size(RAID_SIZE_UNKNOWN)

   _raid_chunksize(raid_chunksize), _position(0), _size(RAID_SIZE_UNKNOWN),

   _fd_vector(0)

{

  DBUG_ENTER("RaidFd::RaidFd");

  DBUG_PRINT("enter",("RaidFd_type: %u  Disks: %u  Chunksize: %d",