Commit b561dd1e authored by unknown's avatar unknown
Browse files

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
parents a5d82874 02848f89

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1242,6 +1242,7 @@ mysql-test/gmon.out 
mysql-test/install_test_db

mysql-test/mtr

mysql-test/mysql-test-run

mysql-test/mysql-test-run-shell

mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster

extra/Makefile.am

+9 −4
Original line number Diff line number Diff line
@@ -22,11 +22,15 @@ BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ 
                        $(top_builddir)/include/sql_state.h \

                        $(top_builddir)/include/mysqld_ername.h

pkginclude_HEADERS=	$(BUILT_SOURCES)

CLEANFILES =		$(BUILT_SOURCES)

DISTCLEANFILES =	$(BUILT_SOURCES)

SUBDIRS =		@yassl_dir@



# This will build mysqld_error.h and sql_state.h

$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)

# This will build mysqld_error.h, mysqld_ername.h and sql_state.h

# NOTE Built files should depend on their sources to avoid

# the built files being rebuilt in source dist

$(top_builddir)/include/mysqld_error.h: comp_err.c \

			$(top_srcdir)/sql/share/errmsg.txt

	$(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)

	$(top_builddir)/extra/comp_err$(EXEEXT) \

	--charset=$(top_srcdir)/sql/share/charsets \

	--out-dir=$(top_builddir)/sql/share/ \
@@ -37,9 +41,10 @@ $(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT) 
$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h

$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h



bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

bin_PROGRAMS =		replace perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid innochecksum

noinst_PROGRAMS =	charset2html

EXTRA_PROGRAMS =	comp_err

EXTRA_DIST =		CMakeLists.txt



perror.o: perror.c

extra/yassl/src/Makefile.am

+4 −0
Original line number Diff line number Diff line
@@ -6,3 +6,7 @@ libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ 
	template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp

EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)

AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX



# Don't update the files from bitkeeper

%::SCCS/s.%

extra/yassl/taocrypt/benchmark/Makefile.am

+1 −3
Original line number Diff line number Diff line 
INCLUDES = -I../include -I../../mySTL

bin_PROGRAMS       = benchmark

benchmark_SOURCES  = benchmark.cpp

benchmark_LDFLAGS  = -L../src

benchmark_LDADD    = -ltaocrypt

benchmark_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la

benchmark_CXXFLAGS = -DYASSL_PURE_C

benchmark_DEPENDENCIES = ../src/libtaocrypt.la

EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat

extra/yassl/taocrypt/src/Makefile.am

+4 −0
Original line number Diff line number Diff line
@@ -11,3 +11,7 @@ libtaocrypt_la_SOURCES = aes.cpp aestables.cpp algebra.cpp arc4.cpp \ 
libtaocrypt_la_CXXFLAGS = @yassl_taocrypt_extra_cxxflags@ -DYASSL_PURE_C



EXTRA_DIST = $(wildcard ../include/*.hpp)



# Don't update the files from bitkeeper

%::SCCS/s.%