Commit 46fd7dec authored by unknown's avatar unknown
Browse files

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

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 2477bd5a 6949b042

BitKeeper/etc/collapsed

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
45214442pBGT9KuZEGixBH71jTzbOA

45214a07hVsIGwvwa-WrO-jpeaSwVw

452a92d0-31-8wSzSfZi165fcGcXPA

452c6c6dAjuNghfc1ObZ_UQ5SCl85g

4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg

454a7ef8gdvE_ddMlJyghvOAkKPNOQ

454f8960jsVT_kMKJtZ9OCgXoba0xQ

4561b2ecZbhuAc0TTDdCdultxUYaMw

4561bde4qWhz1I8tkItXKex5uniipA

4562ba016dYH0JzszOqZ8p6psbKfnQ

config/ac-macros/ssl.m4

+2 −3
Original line number Diff line number Diff line
@@ -28,10 +28,9 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [ 
  yassl_dir="yassl"

  AC_SUBST([yassl_dir])



  yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"

  yassl_libs="\$(top_builddir)/extra/yassl/src/libyassl.la \

              \$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la"

  AC_SUBST(yassl_libs)

  yassl_includes="-I\$(top_srcdir)/extra/yassl/include"

  AC_SUBST(yassl_includes)



  AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for SSL.])

  AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for SSL.])

include/my_pthread.h

+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ void pthread_exit(void *a); /* was #define pthread_exit(A) ExitThread(A)*/ 
#define my_pthread_setprio(A,B)  SetThreadPriority(GetCurrentThread(), (B))

#define pthread_kill(A,B) pthread_dummy(0)



#define pthread_join(A,B) \

  ((WaitForSingleObject((A), INFINITE) != WAIT_OBJECT_0) || !CloseHandle(A))



/* Dummy defines for easier code */

#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)

#define my_pthread_attr_setprio(A,B) pthread_attr_setprio(A,B)

libmysql/libmysql.c

+10 −6
Original line number Diff line number Diff line
@@ -2471,6 +2471,8 @@ static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length) 
  NET	*net= &mysql->net;

  char buff[4 /* size of stmt id */ +

            5 /* execution flags */];

  my_bool res;



  DBUG_ENTER("execute");

  DBUG_DUMP("packet", packet, length);
@@ -2478,16 +2480,18 @@ static my_bool execute(MYSQL_STMT *stmt, char *packet, ulong length) 
  int4store(buff, stmt->stmt_id);		/* Send stmt id to server */

  buff[4]= (char) stmt->flags;

  int4store(buff+5, 1);                         /* iteration count */

  if (cli_advanced_command(mysql, COM_STMT_EXECUTE, buff, sizeof(buff),



  res= test(cli_advanced_command(mysql, COM_STMT_EXECUTE, buff, sizeof(buff),

                                 packet, length, 1, NULL) ||

      (*mysql->methods->read_query_result)(mysql))

            (*mysql->methods->read_query_result)(mysql));

  stmt->affected_rows= mysql->affected_rows;

  stmt->server_status= mysql->server_status;

  stmt->insert_id= mysql->insert_id;

  if (res)

  {

    set_stmt_errmsg(stmt, net->last_error, net->last_errno, net->sqlstate);

    DBUG_RETURN(1);

  }

  stmt->affected_rows= mysql->affected_rows;

  stmt->server_status= mysql->server_status;

  stmt->insert_id= mysql->insert_id;

  DBUG_RETURN(0);

}

libmysqld/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ 
		$(yassl_inc_libs)



if HAVE_YASSL

yassl_inc_libs=	$(top_srcdir)/extra/yassl/src/.libs/libyassl.a \

		$(top_srcdir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a

yassl_inc_libs=	$(top_builddir)/extra/yassl/src/.libs/libyassl.a \

		$(top_builddir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a

endif



# Storage engine specific compilation options