Commit dc50ce99 authored by unknown's avatar unknown
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/time.cc:
  Auto merged
parents ec40f4a5 7c7396ce

client/mysql.cc

+38 −19
Original line number Diff line number Diff line
@@ -2970,6 +2970,7 @@ static int 
com_use(String *buffer __attribute__((unused)), char *line)

{

  char *tmp, buff[FN_REFLEN + 1];

  int select_db;



  bzero(buff, sizeof(buff));

  strmov(buff, line);
@@ -2989,8 +2990,27 @@ com_use(String *buffer __attribute__((unused)), char *line) 
  if (!current_db || cmp_database(charset_info, current_db,tmp))

  {

    if (one_database)

    {

      skip_updates= 1;

      select_db= 0;    // don't do mysql_select_db()

    }

    else

      select_db= 2;    // do mysql_select_db() and build_completion_hash()

  }

  else

  {

    /*

      USE to the current db specified.

      We do need to send mysql_select_db() to make server

      update database level privileges, which might

      change since last USE (see bug#10979).

      For performance purposes, we'll skip rebuilding of completion hash.

    */

    skip_updates= 0;

    select_db= 1;      // do only mysql_select_db(), without completion

  }



  if (select_db)

  {

    /*

      reconnect once if connection is down or if connection was found to
@@ -3011,12 +3031,11 @@ com_use(String *buffer __attribute__((unused)), char *line) 
    my_free(current_db,MYF(MY_ALLOW_ZERO_PTR));

    current_db=my_strdup(tmp,MYF(MY_WME));

#ifdef HAVE_READLINE

    if (select_db > 1)

      build_completion_hash(rehash, 1);

#endif

  }

  }

  else

    skip_updates= 0;



  put_info("Database changed",INFO_INFO);

  return 0;

}

client/mysqldump.c

+22 −12
Original line number Diff line number Diff line
@@ -2239,15 +2239,16 @@ static void dump_table(char *table, char *db) 
      goto err;

    }



    if (opt_disable_keys)

    if (opt_lock)

    {

      fprintf(md_result_file, "\n/*!40000 ALTER TABLE %s DISABLE KEYS */;\n",

              opt_quoted_table);

      fprintf(md_result_file,"LOCK TABLES %s WRITE;\n", opt_quoted_table);

      check_io(md_result_file);

    }

    if (opt_lock)

    /* Moved disable keys to after lock per bug 15977 */

    if (opt_disable_keys)

    {

      fprintf(md_result_file,"LOCK TABLES %s WRITE;\n", opt_quoted_table);

      fprintf(md_result_file, "/*!40000 ALTER TABLE %s DISABLE KEYS */;\n",

	      opt_quoted_table);

      check_io(md_result_file);

    }
@@ -2511,17 +2512,19 @@ static void dump_table(char *table, char *db) 
      error= EX_CONSCHECK;

      goto err;

    }

    if (opt_lock)

    {

      fputs("UNLOCK TABLES;\n", md_result_file);

      check_io(md_result_file);

    }



    /* Moved enable keys to before unlock per bug 15977 */

    if (opt_disable_keys)

    {

      fprintf(md_result_file,"/*!40000 ALTER TABLE %s ENABLE KEYS */;\n",

              opt_quoted_table);

      check_io(md_result_file);

    }

    if (opt_lock)

    {

      fputs("UNLOCK TABLES;\n", md_result_file);

      check_io(md_result_file);

    }

    if (opt_autocommit)

    {

      fprintf(md_result_file, "commit;\n");
@@ -2781,6 +2784,12 @@ static my_bool dump_all_views_in_db(char *database) 
  uint numrows;

  char table_buff[NAME_LEN*2+3];



  if (mysql_select_db(sock, database))

  {

    DB_error(sock, "when selecting the database");

    return 1;

  }



  if (opt_xml)

    print_xml_tag1(md_result_file, "", "database name=", database, "\n");

  if (lock_tables)
@@ -3436,12 +3445,13 @@ static my_bool get_view_structure(char *table, char* db) 
    mysql_free_result(table_res);



    /* Get the result from "select ... information_schema" */

    if (!(table_res= mysql_store_result(sock)))

    if (!(table_res= mysql_store_result(sock)) ||

        !(row= mysql_fetch_row(table_res)))

    {

      safe_exit(EX_MYSQLERR);

      DBUG_RETURN(1);

    }

    row= mysql_fetch_row(table_res);



    lengths= mysql_fetch_lengths(table_res);



    /*

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ AC_ARG_ENABLE(assembler, 


AC_MSG_CHECKING(if we should use assembler functions)

# For now we only support assembler on i386 and sparc systems

AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386")

AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386" && $AS strings/strings-x86.s -o checkassembler >/dev/null 2>&1 && test -f checkassembler && (rm -f checkassembler; exit 0;))

AM_CONDITIONAL(ASSEMBLER_sparc32, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparc")

AM_CONDITIONAL(ASSEMBLER_sparc64, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparcv9")

AM_CONDITIONAL(ASSEMBLER, test "$ASSEMBLER_x86_TRUE" = "" -o "$ASSEMBLER_sparc32_TRUE" = "")

extra/yassl/FLOSS-EXCEPTIONS

0 → 100644
+120 −0
Original line number Diff line number Diff line 
yaSSL FLOSS License Exception

****************************************



Version 0.1, 26 June 2006



The Sawtooth Consulting Ltd. Exception for Free/Libre and Open Source

Software-only Applications Using yaSSL Libraries (the "FLOSS Exception").



*Exception Intent*



We want specified Free/Libre and Open Source Software ("FLOSS")

applications to be able to use specified GPL-licensed yaSSL

libraries (the "Program") despite the fact that not all FLOSS

licenses are compatible with version 2 of the GNU General Public

License (the "GPL").



*Legal Terms and Conditions*



As a special exception to the terms and conditions of version 2.0 of

the GPL:



  1.     You are free to distribute a Derivative Work that is formed

     entirely from the Program and one or more works (each, a "FLOSS

     Work") licensed under one or more of the licenses listed below

     in section 1, as long as:



       1.      You obey the GPL in all respects for the Program and the

          Derivative Work, except for identifiable sections of the

          Derivative Work which are not derived from the Program,

          and which can reasonably be considered independent and

          separate works in themselves,



       2.      all identifiable sections of the Derivative Work which

          are not derived from the Program, and which can reasonably be

          considered independent and separate works in themselves,



             *       i



               are distributed subject to one of the FLOSS licenses

               listed below, and



             *       ii



               the object code or executable form of those sections are

               accompanied by the complete corresponding machine-readable

               source code for those sections on the same medium and under

               the same FLOSS license as the corresponding object code or

               executable forms of those sections, and





       3.      any works which are aggregated with the Program or with

          a Derivative Work on a volume of a storage or distribution

          medium in accordance with the GPL, can reasonably be considered

          independent and separate works in themselves which are not

          derivatives of either the Program, a Derivative Work or a FLOSS

          Work.





     If the above conditions are not met, then the Program may only be

     copied, modified, distributed or used under the terms and

     conditions of the GPL or another valid licensing option from

     Sawtooth Consulting Ltd.



  2.     FLOSS License List



     *License name*                            *Version(s)/Copyright Date*

     Academic Free License                              2.0

     Apache Software License                            1.0/1.1/2.0

     Apple Public Source License                        2.0

     Artistic license                                   From Perl 5.8.0

     BSD license                                        "July 22 1999"

     Common Development and Distribution License (CDDL) 1.0

     Common Public License                              1.0

     GNU Library or "Lesser" General Public             2.0/2.1

     License (LGPL)                           

     Jabber Open Source License                         1.0

     MIT license                                        -

     Mozilla Public License (MPL)                       1.0/1.1

     Open Software License                              2.0

     PHP License                                        3.0

     Python license (CNRI Python License)               -

     Python Software Foundation License                 2.1.1

     Sleepycat License                                  "1999"

     W3C License                                        "2001"

     X11 License                                        "2001"

     Zlib/libpng License                                -

     Zope Public License                                2.0



     Due to the many variants of some of the above licenses, we require

     that any version follow the 2003 version of the Free Software

     Foundation's Free Software Definition

     (http://www.gnu.org/philosophy/free-sw.html

     (http://www.gnu.org/philosophy/free-sw.html))    or version 1.9 of

     the Open Source Definition by the Open Source    Initiative

     (http://www.opensource.org/docs/definition.php

     (http://www.opensource.org/docs/definition.php)).



  3.     Definitions



       1.      Terms used, but not defined, herein shall have the

          meaning provided in the GPL.



       2.      Derivative Work means a derivative work under copyright

          law.





  4.     Applicability This FLOSS Exception applies to all Programs that

     contain a notice placed by Sawtooth Consulting Ltd. saying that the

     Program may be distributed under the terms of this FLOSS Exception.

     If you create or distribute a work which is a Derivative Work of

     both the Program and any other work licensed under the GPL, then

     this FLOSS Exception is not available for that work; thus, you

     must remove the FLOSS Exception notice from that work and

     comply with the GPL in all respects, including by retaining all

     GPL notices. You may choose to redistribute a copy of the

     Program exclusively under the terms of the GPL by removing the

     FLOSS Exception notice from that copy of the Program, provided

     that the copy has never been modified by you or any third party.

extra/yassl/README

+11 −1
Original line number Diff line number Diff line 
yaSSL Release notes, version 1.3.5 (06/01/06)

yaSSL Release notes, version 1.3.7 (06/26/06)





    This release of yaSSL contains bug fixes, portability enhancements,

    and libcurl 7.15.4 support (any newer versions may not build). 



See normal  build instructions below under 1.0.6.

See libcurl build instructions below under 1.3.0.





********************yaSSL Release notes, version 1.3.5 (06/01/06)





    This release of yaSSL contains bug fixes, portability enhancements,