Commit 13eedad2 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-release 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents 14909cb0 375615f7

config/ac-macros/ssl.m4

+12 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [ 
    extra/yassl/src/Makefile dnl

    extra/yassl/testsuite/Makefile)



  with_yassl="yes"

  with_bundled_yassl="yes"



  yassl_dir="yassl"

  AC_SUBST([yassl_dir])
@@ -174,6 +174,16 @@ AC_MSG_CHECKING(for SSL) 
              [mysql_ssl_dir="$withval"],

              [mysql_ssl_dir=no])



  if test "$with_yassl"

  then

    AC_MSG_ERROR([The flag --with-yassl is deprecated, use --with-ssl])

  fi



  if test "$with_openssl"

  then

    AC_MSG_ERROR([The flag --with-openssl is deprecated, use --with-ssl])

  fi



  case "$mysql_ssl_dir" in

    "no")

      #
@@ -196,5 +206,5 @@ AC_MSG_CHECKING(for SSL) 
      MYSQL_FIND_OPENSSL([$mysql_ssl_dir])

      ;;

  esac

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

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

])

sql/sql_insert.cc

+13 −13
Original line number Diff line number Diff line
@@ -2674,11 +2674,6 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, 
}





int

select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)

{

  DBUG_ENTER("select_create::prepare");



class MY_HOOKS : public TABLEOP_HOOKS {

public:

  MY_HOOKS(select_create *x) : ptr(x) { }
@@ -2692,6 +2687,11 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u) 
  select_create *ptr;

};



int

select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)

{

  DBUG_ENTER("select_create::prepare");



  MY_HOOKS hooks(this);



  unit= u;