Commit e01bd0b2 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

Merge sinisa@work.mysql.com:/home/bk/mysql 

into sinisa.nasamreza.org:/mnt/work/mysql
parents 0ccaf940 42095544

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ AUTOMAKE_OPTIONS = foreign 
# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE README \

			COPYING COPYING.LIB MIRRORS

SUBDIRS =		include @docs_dirs@ @readline_dir@ \

SUBDIRS =		. include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ @sql_client_dirs@ \

			@sql_server_dirs@ scripts tests man \

			@bench_dirs@ support-files os2

			@bench_dirs@ support-files os2 libmysql_r



# Relink after clean

CLEANFILES =		linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

bdb/dist/aclocal/mutex.m4

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ fi 
dnl Sparc/gcc: SunOS, Solaris

dnl The sparc/gcc code doesn't always work, specifically, I've seen assembler

dnl failures from the stbar instruction on SunOS 4.1.4/sun4c and gcc 2.7.2.2.

if test "$db_cv_mutex" = DOESNT_WORK; then

if test "$db_cv_mutex" = no; then

AC_TRY_RUN([main(){

#if defined(__sparc__)

#if defined(__GNUC__)

bdb/include/mutex.h

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ typedef unsigned char tsl_t; 
 */

#define	MUTEX_SET(tsl) ({						\

	register tsl_t *__l = (tsl);					\

	int __r;							\

	unsigned char __r;						\

	    asm volatile("tas  %1; \n					\

			  seq  %0"					\

		: "=dm" (__r), "=m" (*__l)				\

client/mysqltest.c

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 


**********************************************************************/



#define MTEST_VERSION "1.10"

#define MTEST_VERSION "1.11"



#include <global.h>

#include <my_sys.h>
@@ -573,7 +573,7 @@ int open_file(const char* name) 
{

  if (*cur_file && cur_file == file_stack_end)

    die("Source directives are nesting too deep");

  if (!(*(cur_file+1) = my_fopen(name, O_RDONLY, MYF(MY_WME))))

  if (!(*(cur_file+1) = my_fopen(name, O_RDONLY | O_BINARY, MYF(MY_WME))))

    die(NullS);

  cur_file++;

  *++lineno=1;
@@ -1589,7 +1589,7 @@ int parse_args(int argc, char **argv) 
	result_file = optarg;

	break;

      case 'x':

      if (!(*cur_file = my_fopen(optarg, O_RDONLY, MYF(MY_WME))))

      if (!(*cur_file = my_fopen(optarg, O_RDONLY | O_BINARY, MYF(MY_WME))))

	  die("Could not open %s: errno = %d", optarg, errno);

	break;

      case 'p':

innobase/btr/btr0pcur.c

+6 −0
Original line number Diff line number Diff line
@@ -292,6 +292,12 @@ btr_pcur_restore_position( 


	mem_heap_free(heap);



	/* We have to store position information, modify clock value, etc.

	because the cursor may now be on a different page */



        btr_pcur_store_position(cursor, mtr);





	return(FALSE);

}