Commit d6a6a488 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-12318 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents e0607f0a 163b04c3

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1121,3 +1121,5 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

support-files/MacOSX/postflight

support-files/MacOSX/preflight

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ static struct my_option my_long_options[] = 
   NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,

   0},

  {"prompt", OPT_PROMPT, "Set the mysql prompt to this value.",

   (gptr*) &current_prompt, (gptr*) &current_prompt, 0, GET_STR_ALLOC,

client/mysqlcheck.c

+8 −3
Original line number Diff line number Diff line
@@ -575,8 +575,13 @@ static void print_result() 


    if (status)

    {

      /*

        if there was an error with the table, we have --auto-repair set,

        and this isn't a repair op, then add the table to the tables4repair

        list

      */

      if (found_error && opt_auto_repair && what_to_do != DO_REPAIR &&

	  (!opt_fast || strcmp(row[3],"OK")))

	  strcmp(row[3],"OK"))

	insert_dynamic(&tables4repair, prev);

      found_error=0;

      if (opt_silent)
@@ -595,8 +600,8 @@ static void print_result() 
    strmov(prev, row[0]);

    putchar('\n');

  }

  if (found_error && opt_auto_repair && what_to_do != DO_REPAIR &&

      !opt_fast)

  /* add the last table to be repaired to the list */

  if (found_error && opt_auto_repair && what_to_do != DO_REPAIR)

    insert_dynamic(&tables4repair, prev);

  mysql_free_result(res);

}

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

+3 −2
Original line number Diff line number Diff line 
dnl -*- ksh -*-

dnl Process this file with autoconf to produce a configure script.



AC_PREREQ(2.57)dnl		Minimum Autoconf version required.

AC_PREREQ(2.52)dnl		Minimum Autoconf version required.



AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM
@@ -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)