Commit 03e8517c authored by unknown's avatar unknown
Browse files

merged 


sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents d32c4314 87ae5a15

config/ac-macros/yassl.m4

+3 −6
Original line number Diff line number Diff line
@@ -5,12 +5,9 @@ extra/yassl/src/Makefile) 


AC_DEFUN([MYSQL_CHECK_YASSL], [

  AC_MSG_CHECKING(for yaSSL)

  AC_ARG_WITH([yassl],

              [  --with-yassl          Include the yaSSL support],

              [yassl=yes],

              [yassl=no])

  AC_ARG_WITH([yassl], [  --with-yassl          Include the yaSSL support],,)



  if test "$yassl" = "yes"

  if test "$with_yassl" = "yes"

  then

    if test "$openssl" != "no"

    then
@@ -30,5 +27,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ 
  AC_SUBST(openssl_libs)

  AC_SUBST(openssl_includes)

  AC_SUBST(yassl_dir)

  AM_CONDITIONAL([HAVE_YASSL], [ test "$yassl" = "yes" ])

  AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])

])

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ AC_PROG_MAKE_SET 
# Hack for OS X/Darwin and Metrowerks CodeWarrior

AC_ARG_WITH(darwin-mwcc,

[  --with-darwin-mwcc      Use Metrowerks CodeWarrior wrappers on OS X/Darwin],[

 if [ "with_darwin_mwcc" = yes ] ; then

  builddir=`pwd`

  ccwrapper="$builddir/support-files/MacOSX/mwcc-wrapper"

  arwrapper="$builddir/support-files/MacOSX/mwar-wrapper"
@@ -141,7 +142,7 @@ AC_ARG_WITH(darwin-mwcc, 
  export CC CXX LD AR RANLIB

  AC_SUBST(AR)

  AC_SUBST(RANLIB)

  with_darwin_mwcc=yes

 fi

])



AM_CONDITIONAL(DARWIN_MWCC, test x$with_darwin_mwcc = xyes)

mysql-test/r/xa.result

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ a 
xa start 'testa','testb';

insert t1 values (30);

xa end 'testa','testb';

xa start 'testa','testb';

ERROR XAE08: XAER_DUPID: The XID already exists

xa start 0x7465737462, 0x2030405060, 0xb;

insert t1 values (40);

xa end 'testb',' 0@P`',11;
@@ -35,11 +37,11 @@ formatID gtrid_length bqual_length data 
11	5	5	testb 0@P`

1	5	5	testatestb

xa commit 'testb',0x2030405060,11;

ERROR XAE04: XAER_NOTA: Unknown XID

xa rollback 'testa','testb';

xa start 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz';

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1

select * from t1;

a

20

40

drop table t1;

mysql-test/t/xa.test

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ xa end 'testa','testb'; 
connect (con1,localhost,,,);

connection con1;



--error 1438

xa start 'testa','testb';



#        gtrid [ , bqual [ , formatID ] ]

xa start 0x7465737462, 0x2030405060, 0xb;

insert t1 values (40);
@@ -47,6 +50,7 @@ xa prepare 'testa','testb'; 


xa recover;



--error 1397

xa commit 'testb',0x2030405060,11;

xa rollback 'testa','testb';

sql/ha_innodb.cc

+1 −1
Original line number Diff line number Diff line
@@ -7032,7 +7032,7 @@ innobase_xa_prepare( 
		return(0);

	}



        trx->xid=thd->transaction.xid;

        trx->xid=thd->transaction.xid_state.xid;



	/* Release a possible FIFO ticket and search latch. Since we will

	reserve the kernel mutex, we have to release the search system latch