Merge branch '10.0' into 10.1

Conflicts:
	CMakeLists.txt
	VERSION
Modified:
	.gitignore

.bzrignore

@@ -1457,3 +1457,5 @@ storage/connect/connect.cnf
 storage/cassandra/cassandra.cnf
 libmysql/libmysql_versions.ld
 scripts/mysql_config.pl
+pcre/pcre_chartables.c
+pcre/test*grep

.gitignore

@@ -76,8 +76,10 @@ packaging/solaris/postinstall-solaris
 pcre/config.h
 pcre/pcre*test.sh
 pcre/pcre.h
+pcre/pcre_chartables.c
 pcre/pcregrep
 pcre/pcretest
+pcre/test*grep
 scripts/comp_sql
 scripts/make_binary_distribution
 scripts/msql2mysql

CMakeLists.txt

@@ -61,6 +61,7 @@ IF(UNIX AND NOT APPLE)
   # Compiling with PIC speeds up embedded build, on PIC sensitive systems 
   # Predefine it to OFF in release builds, because of the performance penalty
   SET(WITH_PIC ${WITH_PIC_DEFAULT} CACHE BOOL "Compile with PIC.")
+  MARK_AS_ADVANCED(WITH_PIC)
 ENDIF()
 
 # Optionally set project name, e.g.
@@ -265,6 +266,10 @@ IF (ENABLE_GCOV AND NOT WIN32 AND NOT APPLE)
   SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage -lgcov")
 ENDIF()
 
+MY_CHECK_C_COMPILER_FLAG(-ggdb3 HAVE_GGDB3)
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb3")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3")
+
 OPTION(ENABLED_LOCAL_INFILE
  "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN})
 MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE)
@@ -478,7 +483,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
 )
 
 INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty
-                      COMPONENT Readme)
+                      EXCEPTIONS-CLIENT COMPONENT Readme)
 INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
                       ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
 

EXCEPTIONS-CLIENT

@@ -0,0 +1,136 @@
+                             FOSS License Exception
+
+   http://www.mysql.com/about/legal/licensing/foss-exception/
+   Updated February 23, 2012
+
+What is the FOSS License Exception?
+
+   Oracle's Free and Open Source Software ("FOSS") License Exception
+   (formerly known as the FLOSS License Exception) allows developers of FOSS
+   applications to include Oracle's MySQL Client Libraries (also referred to
+   as "MySQL Drivers" or "MySQL Connectors") with their FOSS applications.
+   MySQL Client Libraries are typically licensed pursuant to version 2 of the
+   General Public License ("GPL"), but this exception permits distribution of
+   certain MySQL Client Libraries with a developer's FOSS applications
+   licensed under the terms of another FOSS license listed below, even though
+   such other FOSS license may be incompatible with the GPL.
+
+   The following terms and conditions describe the circumstances under which
+   Oracle's FOSS License Exception applies.
+
+Oracle's FOSS License Exception Terms and Conditions
+
+    1. Definitions. "Derivative Work" means a derivative work, as defined
+       under applicable copyright law, formed entirely from the Program and
+       one or more FOSS Applications.
+
+       "FOSS Application" means a free and open source software application
+       distributed subject to a license listed in the section below titled
+       "FOSS License List."
+
+       "FOSS Notice" means a notice placed by Oracle or MySQL in a copy of
+       the MySQL Client Libraries stating that such copy of the MySQL Client
+       Libraries may be distributed under Oracle's or MySQL's FOSS (or FLOSS)
+       License Exception.
+
+       "Independent Work" means portions of the Derivative Work that are not
+       derived from the Program and can reasonably be considered independent
+       and separate works.
+
+       "Program" means a copy of Oracle's MySQL Client Libraries that
+       contains a FOSS Notice.
+
+    2. A FOSS application developer ("you" or "your") may distribute a
+       Derivative Work provided that you and the Derivative Work meet all of
+       the following conditions:
+
+         a. You obey the GPL in all respects for the Program and all portions
+            (including modifications) of the Program included in the
+            Derivative Work (provided that this condition does not apply to
+            Independent Works);
+         b. The Derivative Work does not include any work licensed under the
+            GPL other than the Program;
+         c. You distribute Independent Works subject to a license listed in
+            the section below titled "FOSS License List";
+         d. You distribute Independent Works in object code or executable
+            form with the complete corresponding machine-readable source code
+            on the same medium and under the same FOSS license applying to
+            the object code or executable forms;
+         e. All works that are aggregated with the Program or the Derivative
+            Work on a medium or volume of storage are not derivative works of
+            the Program, Derivative Work or FOSS Application, and must
+            reasonably be considered independent and separate works.
+
+    3. Oracle reserves all rights not expressly granted in these terms and
+       conditions. If all of the above conditions are not met, then this FOSS
+       License Exception does not apply to you or your Derivative Work.
+
+FOSS 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   |1.0                      |
+|(CDDL)                                        |                         |
+|----------------------------------------------+-------------------------|
+|Common Public License                         |1.0                      |
+|----------------------------------------------+-------------------------|
+|Eclipse Public License                        |1.0                      |
+|----------------------------------------------+-------------------------|
+|European Union Public License (EUPL)¹         |1.1                      |
+|----------------------------------------------+-------------------------|
+|GNU Affero General Public License (AGPL)      |3.0                      |
+|----------------------------------------------+-------------------------|
+|GNU Library or "Lesser" General Public License|2.0/2.1/3.0              |
+|(LGPL)                                        |                         |
+|----------------------------------------------+-------------------------|
+|GNU General Public License (GPL)              |3.0                      |
+|----------------------------------------------+-------------------------|
+|IBM Public License                            |1.0                      |
+|----------------------------------------------+-------------------------|
+|Jabber Open Source License                    |1.0                      |
+|----------------------------------------------+-------------------------|
+|MIT License (As listed in file                |-                        |
+|MIT-License.txt)                              |                         |
+|----------------------------------------------+-------------------------|
+|Mozilla Public License (MPL)                  |1.0/1.1                  |
+|----------------------------------------------+-------------------------|
+|Open Software License                         |2.0                      |
+|----------------------------------------------+-------------------------|
+|OpenSSL license (with original SSLeay license)|"2003" ("1998")          |
+|----------------------------------------------+-------------------------|
+|PHP License                                   |3.0/3.01                 |
+|----------------------------------------------+-------------------------|
+|Python license (CNRI Python License)          |-                        |
+|----------------------------------------------+-------------------------|
+|Python Software Foundation License            |2.1.1                    |
+|----------------------------------------------+-------------------------|
+|Sleepycat License                             |"1999"                   |
+|----------------------------------------------+-------------------------|
+|University of Illinois/NCSA Open Source       |-                        |
+|License                                       |                         |
+|----------------------------------------------+-------------------------|
+|W3C License                                   |"2001"                   |
+|----------------------------------------------+-------------------------|
+|X11 License                                   |"2001"                   |
+|----------------------------------------------+-------------------------|
+|Zlib/libpng License                           |-                        |
+|----------------------------------------------+-------------------------|
+|Zope Public License                           |2.0                      |
++------------------------------------------------------------------------+
+
+¹) When an Independent Work is licensed under a "Compatible License"
+pursuant to the EUPL, the Compatible License rather than the EUPL is the
+applicable license for purposes of these FOSS License Exception Terms and
+Conditions.
+

client/mysqltest.cc

@@ -949,9 +949,13 @@ static int do_read_query_result(struct st_connection *cn)
 {
   DBUG_ASSERT(cn->has_thread);
   wait_query_thread_done(cn);
+  if (cn->result)
+    goto exit_func;
+
   signal_connection_thd(cn, EMB_READ_QUERY_RESULT);
   wait_query_thread_done(cn);
 
+exit_func:
   return cn->result;
 }
 

cmake/os/WindowsCache.cmake

@@ -370,4 +370,5 @@ SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "")
 SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "")
 SET(HAVE_UCONTEXT_H CACHE INTERNAL "")
 SET(HAVE_SOCKPEERCRED CACHE INTERNAL "")
-ENDIF()
+SET(HAVE_GGDB3 CACHE INTERNAL "")
+ENDIF(MSVC)

dbug/CMakeLists.txt

@@ -30,6 +30,8 @@ TARGET_LINK_LIBRARIES(factorial dbug)
 IF(NOT WIN32 AND NOT CMAKE_GENERATOR MATCHES Xcode)
   FIND_PROGRAM(GROFF groff)
   FIND_PROGRAM(NROFF nroff)
+  MARK_AS_ADVANCED(GROFF)
+  MARK_AS_ADVANCED(NROFF)
   SET(OUTPUT_INC output1.r output2.r output3.r output4.r output5.r)
   SET(SOURCE_INC factorial.r main.r example1.r example2.r example3.r)
   ADD_CUSTOM_COMMAND(OUTPUT ${OUTPUT_INC}