Commit 690101ad authored by unknown's avatar unknown
Browse files

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

into  siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)


include/my_base.h:
  Auto merged
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/lib/mtr_report.pl:
  merge of mysql-5.1 -> mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
  merge of mysql-5.1 -> mysql-5.1-new-maint
parents d6e3a9dd 906cd90d

.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_base.h

+10 −1
Original line number Diff line number Diff line
@@ -155,7 +155,16 @@ enum ha_extra_function { 
    Mark the table as a log table. For some handlers (e.g. CSV) this results

    in a special locking for the table.

  */

  HA_EXTRA_MARK_AS_LOG_TABLE

  HA_EXTRA_MARK_AS_LOG_TABLE,

  /*

    Informs handler that write_row() which tries to insert new row into the

    table and encounters some already existing row with same primary/unique

    key can replace old row with new row instead of reporting error (basically

    it informs handler that we do REPLACE instead of simple INSERT).

    Off by default.

  */

  HA_EXTRA_WRITE_CAN_REPLACE,

  HA_EXTRA_WRITE_CANNOT_REPLACE

};



	/* The following is parameter to ha_panic() */

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"