Commit eef51cd8 authored by unknown's avatar unknown
Browse files

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
parents 3459da7d 13475abf

config/ac-macros/misc.m4

+0 −30
Original line number Diff line number Diff line 
# Local macros for automake & autoconf



# A local version of AC_CHECK_SIZEOF that includes sys/types.h

dnl MYSQL_CHECK_SIZEOF(TYPE [, CROSS-SIZE])

AC_DEFUN([MYSQL_CHECK_SIZEOF],

[changequote(<<, >>)dnl

dnl The name to #define.

define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl

dnl The cache variable name.

define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl

changequote([, ])dnl

AC_MSG_CHECKING(size of $1)

AC_CACHE_VAL(AC_CV_NAME,

[AC_TRY_RUN([#include <stdio.h>

#include <sys/types.h>

#if STDC_HEADERS

#include <stdlib.h>

#include <stddef.h>

#endif

main()

{

  FILE *f=fopen("conftestval", "w");

  if (!f) exit(1);

  fprintf(f, "%d\n", sizeof($1));

  exit(0);

}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl

AC_MSG_RESULT($AC_CV_NAME)

AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [ ])

undefine([AC_TYPE_NAME])dnl

undefine([AC_CV_NAME])dnl

])



#---START: Used in for client configure

AC_DEFUN([MYSQL_TYPE_ACCEPT],

[ac_save_CXXFLAGS="$CXXFLAGS"

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,7 @@ then 
  AC_MSG_ERROR("MySQL needs a long long type.")

fi

# off_t is not a builtin type

MYSQL_CHECK_SIZEOF(off_t, 4)

AC_CHECK_SIZEOF(off_t, 4)

if test "$ac_cv_sizeof_off_t" -eq 0

then

  AC_MSG_ERROR("MySQL needs a off_t type.")

include/my_atomic.h

+7 −1
Original line number Diff line number Diff line
@@ -135,7 +135,13 @@ make_atomic_swap(ptr) 
#undef _atomic_h_cleanup_

#endif



typedef int32 intptr; /* TODO configure check */

#if SIZEOF_CHARP == SIZEOF_INT

typedef int intptr;

#elif SIZEOF_CHARP == SIZEOF_LONG

typedef long intptr;

#else

#error

#endif



#define MY_ATOMIC_OK       0

#define MY_ATOMIC_NOT_1CPU 1

mysql-test/r/mysqldump.result

+1 −1
Original line number Diff line number Diff line
@@ -2279,7 +2279,7 @@ INSERT INTO t1 VALUES(1), (2), (3), (4), (5); 
CREATE FUNCTION `bug9056_func1`(a INT, b INT) RETURNS int(11) RETURN a+b //

CREATE PROCEDURE `bug9056_proc1`(IN a INT, IN b INT, OUT c INT)

BEGIN SELECT a+b INTO c; end  //

create function bug9056_func2(f1 char binary) returns char binary

create function bug9056_func2(f1 char binary) returns char

begin

set f1= concat( 'hello', f1 );

return f1;

mysql-test/r/sp-error.result

+5 −0
Original line number Diff line number Diff line
@@ -1181,3 +1181,8 @@ show authors; 
return 42;

end|

ERROR 0A000: Not allowed to return a result set from a function

drop function if exists bug20701|

create function bug20701() returns varchar(25) binary return "test"|

ERROR 42000: This version of MySQL doesn't yet support 'return value collation'

create function bug20701() returns varchar(25) return "test"|

drop function bug20701|