Commit a04007d9 authored by Timothy Smith's avatar Timothy Smith
Browse files

Merge 5.1 main to 5.1-build

parents 5ee1339d dd47146d

BUILD/check-cpu

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ check_cpu () { 
  fi



  cc_ver=`$cc --version | sed 1q`

  cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

  cc_verno=`echo $cc_ver | sed -e 's/^.*(GCC)//g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

  set -- `echo $cc_verno | tr '.' ' '`

  cc_major=$1

  cc_minor=$2

Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ bin-dist: all 
	$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@



# Remove BK's "SCCS" subdirectories from source distribution

# Create initial database files for Windows installations.

# Create initial database files for Windows installations and check them.

dist-hook:

	rm -rf `find $(distdir) -type d -name SCCS -print`

	mkdir -p $(distdir)/win
@@ -57,6 +57,7 @@ dist-hook: 
		--builddir=$(top_builddir) \

		--datadir=$(distdir)/win/data \

		--srcdir=$(top_srcdir)

	storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI



tags:

	support-files/build-tags

include/my_sys.h

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ extern int NEAR my_umask, /* Default creation mask */ 
	   NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */

	   NEAR my_dont_interrupt;	/* call remember_intr when set */

extern my_bool NEAR mysys_uses_curses, my_use_symdir;

extern ulong sf_malloc_cur_memory, sf_malloc_max_memory;

extern size_t sf_malloc_cur_memory, sf_malloc_max_memory;



extern ulong	my_default_record_cache_size;

extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io,

libmysqld/lib_sql.cc

+3 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,9 @@ void Protocol_text::prepare_for_resend() 
  data->embedded_info->prev_ptr= &cur->next;

  next_field=cur->data;

  next_mysql_field= data->embedded_info->fields_list;

#ifndef DBUG_OFF

  field_pos= 0;

#endif



  DBUG_VOID_RETURN;

}

mysql-test/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(distdir)/std_data/ndb_backup51_data_be

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(distdir)/std_data/ndb_backup51_data_le

	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts

	$(INSTALL_DATA) $(srcdir)/std_data/parts/*.MY* $(distdir)/std_data/parts

	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My
@@ -132,6 +133,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be

	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le

	$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts

	$(INSTALL_DATA) $(srcdir)/std_data/parts/*.MY* $(DESTDIR)$(testdir)/std_data/parts

	$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(DESTDIR)$(testdir)/std_data/funcs_1

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My