Commit 4bdc4251 authored by unknown's avatar unknown
Browse files

Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 

into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-15977
parents 3efeb892 76215977

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ static int read_lines(bool execute_commands) 
      (We want to allow help, print and clear anywhere at line start

    */

    if (execute_commands && (named_cmds || glob_buffer.is_empty()) 

	&& !in_string && (com=find_command(line,0)))

	&& !ml_comment && !in_string && (com=find_command(line,0)))

    {

      if ((*com->func)(&glob_buffer,line) > 0)

	break;

configure.in

+4 −4
Original line number Diff line number Diff line
@@ -441,18 +441,18 @@ fi 
AC_SUBST(LD_VERSION_SCRIPT)



# Avoid bug in fcntl on some versions of linux

AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")

AC_MSG_CHECKING([if we should use 'skip-external-locking' as default for $target_os])

# Any wariation of Linux

if expr "$target_os" : "[[Ll]]inux.*" > /dev/null

then

  MYSQLD_DEFAULT_SWITCHES="--skip-locking"

  MYSQLD_DEFAULT_SWITCHES="--skip-external-locking"

  TARGET_LINUX="true"

  AC_MSG_RESULT("yes")

  AC_MSG_RESULT([yes])

  AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux])

else

  MYSQLD_DEFAULT_SWITCHES=""

  TARGET_LINUX="false"

  AC_MSG_RESULT("no")

  AC_MSG_RESULT([no])

fi

AC_SUBST(MYSQLD_DEFAULT_SWITCHES)

AC_SUBST(TARGET_LINUX)

heap/hp_test1.c

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ int main(int argc, char **argv) 
  get_options(argc,argv);



  bzero(&hp_create_info, sizeof(hp_create_info));

  hp_create_info.max_table_size= 1024L*1024L;



  keyinfo[0].keysegs=1;

  keyinfo[0].seg=keyseg;
@@ -58,7 +59,7 @@ int main(int argc, char **argv) 
  bzero((gptr) flags,sizeof(flags));



  printf("- Creating heap-file\n");

  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000l,10l,

  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,10L,

		  &hp_create_info) ||

      !(file= heap_open(filename, 2)))

    goto err;

heap/hp_test2.c

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ int main(int argc, char *argv[]) 
  get_options(argc,argv);

  

  bzero(&hp_create_info, sizeof(hp_create_info));

  hp_create_info.max_table_size= 1024L*1024L;



  write_count=update=opt_delete=0;

  key_check=0;

include/my_global.h

+2 −2
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ do { doubleget_union _tmp; \ 
#define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \

			     *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \

                         } while (0)

#define float4get(V,M) do { *((long *) &(V)) = *((long*) (M)); } while(0)

#define float4get(V,M)   do { *((float *) &(V)) = *((float*) (M)); } while(0)

#define float8get(V,M)   doubleget((V),(M))

#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))

#define floatstore(T,V)  memcpy((byte*)(T), (byte*)(&V),sizeof(float))