Commit 0745a2b7 authored by unknown's avatar unknown
Browse files

after merge fix 


myisam/Makefile.am:
  put zlib at the end (libtool adds the whole bunch of dependencies right after that)
sql/Makefile.am:
  put zlib at the end (libtool adds the whole bunch of dependencies right after that)
parent 5f74f8d5

myisam/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include 
LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \

			$(top_builddir)/mysys/libmysys.a \

			$(top_builddir)/dbug/libdbug.a \

			@ZLIB_LIBS@ \

			$(top_builddir)/strings/libmystrings.a

			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@

pkglib_LIBRARIES =	libmyisam.a

bin_PROGRAMS =		myisamchk myisamlog myisampack myisam_ftdump

myisamchk_DEPENDENCIES=	$(LIBRARIES)

mysql-test/r/flush_block_commit.result

+1 −1
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (a int) type=innodb;

create table t1 (a int) engine=innodb;

begin;

insert into t1 values(1);

flush tables with read lock;

mysql-test/t/flush_block_commit.test

+4 −1
Original line number Diff line number Diff line
@@ -8,8 +8,11 @@ connect (con1,localhost,root,,); 
connect (con2,localhost,root,,);

connect (con3,localhost,root,,);

connection con1;



--disable_warnings

drop table if exists t1;

create table t1 (a int) type=innodb;

--enable_warnings

create table t1 (a int) engine=innodb;



# blocks COMMIT ?

sql/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ noinst_PROGRAMS = gen_lex_hash 
bin_PROGRAMS =		mysql_tzinfo_to_sql

gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@

LDADD =			@isam_libs@ \

			@ZLIB_LIBS@ \

			$(top_builddir)/myisam/libmyisam.a \

			$(top_builddir)/myisammrg/libmyisammrg.a \

			$(top_builddir)/heap/libheap.a \
@@ -38,7 +37,7 @@ LDADD = @isam_libs@ \ 
			$(top_builddir)/mysys/libmysys.a \

			$(top_builddir)/dbug/libdbug.a \

			$(top_builddir)/regex/libregex.a \

			$(top_builddir)/strings/libmystrings.a 

			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@



mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \

			@bdb_libs@ @innodb_libs@ @pstack_libs@ \

sql/handler.cc

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans) 
#ifdef USING_TRANSACTIONS

  if (opt_using_transactions)

  {

    bool operation_done= 0;

    bool transaction_commited= 0;

    bool operation_done= 0, need_start_waiters= 0;



    /* If transaction has done some updates to tables */