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

Merge bodhi.local:/opt/local/work/tmp_merge 

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysys/my_handler.c:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/heap/hp_test1.c:
  Auto merged
storage/heap/hp_test2.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
sql/table.cc:
  Use local (manual merge)
mysql-test/mysql-test-run.sh:
  Manual merge.
sql/ha_ndbcluster.cc:
  Manual merge.
sql/item.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
parents 5e643e31 0bbc6fbe

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,7 @@ scripts/mysql_secure_installation 
scripts/mysql_setpermission

scripts/mysql_tableinfo

scripts/mysql_upgrade

scripts/mysql_upgrade_shell

scripts/mysql_zap

scripts/mysqlaccess

scripts/mysqlbug

configure.in

+4 −4
Original line number Diff line number Diff line
@@ -358,18 +358,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 variation 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)

include/my_global.h

+2 −2
Original line number Diff line number Diff line
@@ -1159,7 +1159,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))

include/my_handler.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#ifndef _my_handler_h

#define _my_handler_h



#include "my_global.h"

#include "my_base.h"

#include "m_ctype.h"

#include "myisampack.h"

libmysql/libmysql.c

+3 −4
Original line number Diff line number Diff line
@@ -2385,10 +2385,9 @@ static void net_store_datetime(NET *net, MYSQL_TIME *tm) 


static void store_param_date(NET *net, MYSQL_BIND *param)

{

  MYSQL_TIME *tm= (MYSQL_TIME *) param->buffer;

  tm->hour= tm->minute= tm->second= 0;

  tm->second_part= 0;

  net_store_datetime(net, tm);

  MYSQL_TIME tm= *((MYSQL_TIME *) param->buffer);

  tm.hour= tm.minute= tm.second= tm.second_part= 0;

  net_store_datetime(net, &tm);

}



static void store_param_datetime(NET *net, MYSQL_BIND *param)