Skip to content

M
MariaDB
Commit 7bdecb1d authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files
Options

merge

parents 6a9822a8 0673d8ef
Hide whitespace changes
Inline Side-by-side
Showing with 526 additions and 316 deletions
README
View file @ 7bdecb1d
...@@ -68,7 +68,6 @@ Use of any of this software is governed by the terms of the license below: ...@@ -68,7 +68,6 @@ Use of any of this software is governed by the terms of the license below:
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information. # See the License for more information.
#=========================================================================== #===========================================================================
==
# (To distributed this file outside of CMake, substitute the full # (To distributed this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
# #
...@@ -122,27 +121,30 @@ CMake is distributed under BSD License ...@@ -122,27 +121,30 @@ CMake is distributed under BSD License
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright notice, * Redistributions of source code must retain the above copyright
this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright * Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in
documentation and/or other materials provided with the distribution. the documentation and/or other materials provided with the
* Neither the name of Kitware, Inc. nor the names of its contributors distribution.
may be used to endorse or promote products derived from this software without * Neither the name of Kitware, Inc. nor the names of its
specific prior written permission. contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY Kitware, Inc. "AS IS" AND ANY EXPRESS OR THIS SOFTWARE IS PROVIDED BY Kitware, Inc. "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
SHALL Kitware Inc. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, DISCLAIMED. IN NO EVENT SHALL Kitware Inc. BE LIABLE FOR ANY DIRECT,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
OF SUCH DAMAGE. IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
Additional License(s) Additional License(s)
...@@ -186,20 +188,16 @@ cmake-2.4.8/Utilities/cmtar/compat/gethostname.c: ...@@ -186,20 +188,16 @@ cmake-2.4.8/Utilities/cmtar/compat/gethostname.c:
************************************************************************** **************************************************************************
* * Author : Per Foreby, perf@efd.lth.se
Author : Per Foreby, perf@efd.lth.se * Author : Juergen Pfeifer, juergen.pfeifer@gmx.net
*
Author : Juergen Pfeifer, juergen.pfeifer@gmx.net
*
*
************************************************************************** **************************************************************************
---------------------------------------- ----------------------------------------
Copyright (c) 2002 Insight Consortium. All rights reserved. Copyright (c) 2002 Insight Consortium. All rights reserved.
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for
details. details.
This software is distributed WITHOUT ANY WARRANTY; without even This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
...@@ -208,9 +206,8 @@ details. ...@@ -208,9 +206,8 @@ details.
-------------------------------------------- --------------------------------------------
Skeleton parser for Yacc-like parsing with Bison, Skeleton parser for Yacc-like parsing with Bison,
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software
Software Foundati Foundation, Inc.
on, Inc.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -253,35 +250,27 @@ cmake-2.4.8/Utilities/cmzlib/zlib.h: ...@@ -253,35 +250,27 @@ cmake-2.4.8/Utilities/cmzlib/zlib.h:
in a product, an acknowledgment in the product documentation would be in a product, an acknowledgment in the product documentation would be
appreciated but is not required. appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must 2. Altered source versions must be plainly marked as such, and must
not be not be misrepresented as being the original software.
misrepresented as being the original software.
3. This notice may not be removed or altered from any source 3. This notice may not be removed or altered from any source
distribution. distribution.
Jean-loup Gailly Mark Adler Jean-loup Gailly Mark Adler
---------------------------------------------- ----------------------------------------------
This source code was modified by Martin Hedenfalk This source code was modified by Martin Hedenfalk for use in Curl. His
for latest changes were done 2000-09-18.
use in Curl. His latest changes were done 2000-09-18.
It has since been patched away like a madman by Daniel Stenberg It has since been patched away like a madman by Daniel Stenberg to make it
to make it better applied to curl conditions, and to better applied to curl conditions, and to make it not use globals, pollute
make name space and more. This source code awaits a rewrite to work around the
it not use globals, pollute name space and more. This source code paragraph 2 in the BSD licenses as explained below.
awaits a
rewrite to work around the paragraph 2 in the BSD licenses as explained
below.
Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Hgskolan Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Hgskolan
It has since been patched and modified a lot by Daniel Stenberg It has since been patched and modified a lot by Daniel Stenberg to make it
to make it better applied to curl conditions, and to better applied to curl conditions, and to make it not use globals, pollute
make name space and more. This source code awaits a rewrite to work around the
it not use globals, pollute name space and more. This source code paragraph 2 in the BSD licenses as explained below.
awaits a
rewrite to work around the paragraph 2 in the BSD licenses as explained
below.
Copyright (c) 1998, 1999 Kungliga Tekniska Hgskolan Copyright (c) 1998, 1999 Kungliga Tekniska Hgskolan
(Royal Institute of Technology, Stockholm, Sweden). (Royal Institute of Technology, Stockholm, Sweden).
...@@ -304,19 +293,15 @@ awaits a ...@@ -304,19 +293,15 @@ awaits a
THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
LIABLE DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CONSEQUENTIAL CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. SUCH DAMAGE.
--------------------------------------------- ---------------------------------------------
...@@ -332,8 +317,7 @@ STRICT ...@@ -332,8 +317,7 @@ STRICT
-------------------------------------------------- --------------------------------------------------
cmake-2.4.8/Utilities/cmcurl/inet_pton.c, cmake-2.4.8/Utilities/cmcurl/inet_pton.c,
cmake-2.4.8/Source/CTest/Curl/inet_pto cmake-2.4.8/Source/CTest/Curl/inet_pton.c:
n.c:
This is from the BIND 4.9.4 release, modified to compile by itself This is from the BIND 4.9.4 release, modified to compile by itself
Copyright (c) 1996 by Internet Software Consortium. Copyright (c) 1996 by Internet Software Consortium.
...@@ -343,16 +327,13 @@ n.c: ...@@ -343,16 +327,13 @@ n.c:
copyright notice and this permission notice appear in all copies. copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
DISCLAIMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
WARRANTIES INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT,
OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS PERFORMANCE OF THIS SOFTWARE.
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
OF THIS
SOFTWARE.
------------------------------------------------------- -------------------------------------------------------
...@@ -369,24 +350,19 @@ OF THIS ...@@ -369,24 +350,19 @@ OF THIS
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products * 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written * derived from this software without specific prior written permission.
permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
PURPOSE * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
CONSEQUENTIAL * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
** SUCH DAMAGE. * SUCH DAMAGE.
--------------------------------------------------- ---------------------------------------------------
...@@ -433,23 +409,20 @@ ANY WAY ...@@ -433,23 +409,20 @@ ANY WAY
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software 3. All advertising materials mentioning features or use of this software
must display the following acknowledgement: must display the following acknowledgement:
This product includes software developed by the University of This product includes software developed by the University of
California, Berkeley and its contributors. California, Berkeley and its contributors.
4. Neither the name of the University nor the names of its contributors 4. Neither the name of the University nor the names of its contributors
may be used to endorse or promote products derived from this software may be used to endorse or promote products derived from this software
without specific prior written permission. without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE. SUCH DAMAGE.
...@@ -480,60 +453,33 @@ STRICT ...@@ -480,60 +453,33 @@ STRICT
*************************************************************************** ***************************************************************************
Copyright (c) 1998 Free Software Foundation, Inc. Copyright (c) 1998 Free Software Foundation, Inc.
*
Copyright (c) 1998,2000 Free Software Foundation, Inc. Copyright (c) 1998,2000 Free Software Foundation, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
Permission is hereby granted, free of charge, to any person obtaining copy of this software and associated documentation files (the
a * "Software"), to deal in the Software without restriction, including
copy of this software and associated documentation files (the without limitation the rights to use, copy, modify, merge, publish,
* distribute, distribute with modifications, sublicense, and/or sell copies
"Software"), to deal in the Software without restriction, including of the Software, and to permit persons to whom the Software is furnished
* to do so, subject to the following conditions:
without limitation the rights to use, copy, modify, merge, publish,
*
distribute, distribute with modifications, sublicense, and/or sell
*
copies of the Software, and to permit persons to whom the Software is
*
furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
The above copyright notice and this permission notice shall be all copies or substantial portions of the Software.
included *
in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
EXPRESS * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
*
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. *
IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, *
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR USE OR OTHER DEALINGS IN THE SOFTWARE.
*
THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*
* Except as contained in this notice, the name(s) of the above copyright
Except as contained in this notice, the name(s) of the above holders shall not be used in advertising or otherwise to promote the sale,
copyright * use or other dealings in this Software without prior written
holders shall not be used in advertising or otherwise to promote the
*
sale, use or other dealings in this Software without prior written
*
authorization. authorization.
* ***************************************************************************
***************************************************************************
------------------------------------------------------ ------------------------------------------------------
...@@ -551,30 +497,25 @@ copyright * ...@@ -551,30 +497,25 @@ copyright *
3. The name of the author may not be used to endorse or promote products 3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission. derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
PURPOSE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
CONSEQUENTIAL SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE. SUCH DAMAGE.
...@@ -586,31 +527,29 @@ Fred Fish's Dbug Library ...@@ -586,31 +527,29 @@ Fred Fish's Dbug Library
Use of any of this software is governed by the terms of the license below: Use of any of this software is governed by the terms of the license below:
* * N O T I C E *
* N O T I C E * * *
* * * Copyright Abandoned, 1987, Fred Fish *
* Copyright Abandoned, 1987, Fred Fish * * *
* * * *
* *
* This previously copyrighted work has been placed into the public * * This previously copyrighted work has been placed into the public *
* domain by the author and may be freely used for any purpose, * * domain by the author and may be freely used for any purpose, *
* private or commercial. * * private or commercial. *
* * * *
* Because of the number of inquiries I was receiving about the use * * Because of the number of inquiries I was receiving about the use *
* of this product in commercially developed works I have decided to * * of this product in commercially developed works I have decided to *
* simply make it public domain to further its unrestricted use. I * * simply make it public domain to further its unrestricted use. I *
* specifically would be most happy to see this material become a * * specifically would be most happy to see this material become a *
* part of the standard Unix distributions by AT&T and the Berkeley * * part of the standard Unix distributions by AT&T and the Berkeley *
* Computer Science Research Group, and a standard part of the GNU * * Computer Science Research Group, and a standard part of the GNU *
* system from the Free Software Foundation. * * system from the Free Software Foundation. *
* * * *
* I would appreciate it, as a courtesy, if this notice is left in * * I would appreciate it, as a courtesy, if this notice is left in *
* all copies and derivative works. Thank you. * * all copies and derivative works. Thank you. *
* * * *
* The author makes no warranty of any kind with respect to this * * The author makes no warranty of any kind with respect to this *
* product and explicitly disclaims any implied warranties of mer- * * product and explicitly disclaims any implied warranties of mer- *
* chantability or fitness for any particular purpose. * * chantability or fitness for any particular purpose. *
*
*************************************************************************** ***************************************************************************
...@@ -619,28 +558,27 @@ dbug_analyze.c (part of Fred Fish's Dbug Library) ...@@ -619,28 +558,27 @@ dbug_analyze.c (part of Fred Fish's Dbug Library)
Use of any of this software is governed by the terms of the license below: Use of any of this software is governed by the terms of the license below:
* * * Copyright Abandoned, 1987, Fred Fish *
* Copyright Abandoned, 1987, Fred Fish * * *
* * * *
* * * This previously copyrighted work has been placed into the public *
* This previously copyrighted work has been placed into the public * * domain by the author and may be freely used for any purpose, *
* domain by the author and may be freely used for any purpose, * * private or commercial. *
* private or commercial. * * *
* * * Because of the number of inquiries I was receiving about the use *
* Because of the number of inquiries I was receiving about the use * * of this product in commercially developed works I have decided to *
* of this product in commercially developed works I have decided to * * simply make it public domain to further its unrestricted use. I *
* simply make it public domain to further its unrestricted use. I * * specifically would be most happy to see this material become a *
* specifically would be most happy to see this material become a * * part of the standard Unix distributions by AT&T and the Berkeley *
* part of the standard Unix distributions by AT&T and the Berkeley * * Computer Science Research Group, and a standard part of the GNU *
* Computer Science Research Group, and a standard part of the GNU * * system from the Free Software Foundation. *
* system from the Free Software Foundation. * * *
* * * I would appreciate it, as a courtesy, if this notice is left in *
* I would appreciate it, as a courtesy, if this notice is left in * * all copies and derivative works. Thank you. *
* all copies and derivative works. Thank you. * * *
* * * The author makes no warranty of any kind with respect to this *
* The author makes no warranty of any kind with respect to this * * product and explicitly disclaims any implied warranties of mer- *
* product and explicitly disclaims any implied warranties of mer- * * chantability or fitness for any particular purpose. *
* chantability or fitness for any particular purpose.
*************************************************************************** ***************************************************************************
...@@ -1454,11 +1392,9 @@ text: ...@@ -1454,11 +1392,9 @@ text:
Library General Public License for more details. Library General Public License for more details.
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If License along with the GNU C Library; see the file COPYING.LIB. If not,
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite
write to the Free Software Foundation, Inc., 59 Temple Place - 330, Boston, MA 02111-1307, USA. */
Suite 330,
Boston, MA 02111-1307, USA. */
...@@ -1548,104 +1484,121 @@ Use of any of this software is governed by the terms of the license below: ...@@ -1548,104 +1484,121 @@ Use of any of this software is governed by the terms of the license below:
Unicode Terms of Use Unicode Terms of Use
For the general privacy policy governing access to this site, see the For the general privacy policy governing access to this site, see the
Unicode Privacy Policy. For trademark usage, see the Unicode Consortium® Unicode Privacy Policy. For trademark usage, see the Unicode
Trademarks and Logo Policy. Consortium (R) Trademarks and Logo Policy.
Notice to End User: Terms of Use Notice to End User: Terms of Use
Carefully read the following legal agreement ("Agreement"). Use or copying Carefully read the following legal agreement ("Agreement"). Use or
of the software and/or codes provided with this agreement (The "Software") copying of the software and/or codes provided with this agreement (The
constitutes your acceptance of these terms "Software") constitutes your acceptance of these terms
1. Unicode Copyright. 1. Unicode Copyright.
1. Copyright © 1991-2008 Unicode, Inc. All rights reserved. 1. Copyright (c) 1991-2008 Unicode, Inc. All rights reserved.
2. Certain documents and files on this website contain a legend 2. Certain documents and files on this website contain a
indicating that "Modification is permitted." Any person is hereby authorized, legend indicating that "Modification is permitted." Any person
without fee, to modify such documents and files to create derivative works is hereby authorized, without fee, to modify such documents
conforming to the Unicode® Standard, subject to Terms and Conditions herein. and files to create derivative works conforming to the
Unicode (R) Standard, subject to Terms and Conditions herein.
3. Any person is hereby authorized, without fee, to view, use, 3. Any person is hereby authorized, without fee, to view, use,
reproduce, and distribute all documents and files solely for informational reproduce, and distribute all documents and files solely for
purposes in the creation of products supporting the Unicode Standard, subject to informational purposes in the creation of products supporting
the Terms and Conditions herein. the Unicode Standard, subject to the Terms and Conditions
4. Further specifications of rights and restrictions pertaining to herein.
the use of the particular set of data files known as the "Unicode Character 4. Further specifications of rights and restrictions
Database" can be found in Exhibit 1. pertaining to the use of the particular set of data files
5. Each version of the Unicode Standard has further specifications known as the "Unicode Character Database" can be found in
of rights and restrictions of use. For the book editions, these are found on the Exhibit 1.
back of the title page. For the online edition, certain files (such as the PDF 5. Each version of the Unicode Standard has further
files for book chapters and code charts) carry specific restrictions. All other specifications of rights and restrictions of use. For the book
files are covered under these general Terms of Use. To request a permission to editions, these are found on the back of the title page. For
reproduce any part of the Unicode Standard, please contact the Unicode Consortium. the online edition, certain files (such as the PDF files for
6. No license is granted to "mirror" the Unicode website where a book chapters and code charts) carry specific restrictions.
fee is charged for access to the "mirror" site. All other files are covered under these general Terms of Use.
7. Modification is not permitted with respect to this document. All To request a permission to reproduce any part of the Unicode
copies of this document must be verbatim. Standard, please contact the Unicode Consortium.
6. No license is granted to "mirror" the Unicode website where
a fee is charged for access to the "mirror" site.
7. Modification is not permitted with respect to this
document. All copies of this document must be verbatim.
2. Restricted Rights Legend. Any technical data or software which is 2. Restricted Rights Legend. Any technical data or software which is
licensed to the United States of America, its agencies and/or instrumentalities licensed to the United States of America, its agencies and/or
under this Agreement is commercial technical data or commercial computer instrumentalities under this Agreement is commercial technical data
software developed exclusively at private expense as defined in FAR 2.101, or or commercial computer software developed exclusively at private
DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995),
duplication, or disclosure by the Government is subject to restrictions as set as applicable. For technical data, use, duplication, or disclosure
forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and by the Government is subject to restrictions as set forth in DFARS
this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and
as applicable, use, duplication or disclosure by the Government is subject to this Agreement. For Software, in accordance with FAR 12-212 or DFARS
the restrictions set forth in this Agreement. 227-7202, as applicable, use, duplication or disclosure by the
Government is subject to the restrictions set forth in this
Agreement.
3. Warranties and Disclaimers. 3. Warranties and Disclaimers.
1. This publication and/or website may include technical or 1. This publication and/or website may include technical or
typographical errors or other inaccuracies . Changes are periodically added to typographical errors or other inaccuracies . Changes are
the information herein; these changes will be incorporated in new editions of periodically added to the information herein; these changes
the publication and/or website. Unicode may make improvements and/or changes in will be incorporated in new editions of the publication and/or
the product(s) and/or program(s) described in this publication and/or website at website. Unicode may make improvements and/or changes in the
any time. product(s) and/or program(s) described in this publication
2. If this file has been purchased on magnetic or optical media and/or website at any time.
from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange 2. If this file has been purchased on magnetic or optical
of the defective media within ninety (90) days of original purchase. media from Unicode, Inc. the sole and exclusive remedy for any
claim will be exchange of the defective media within ninety
(90) days of original purchase.
3. EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR 3. EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR
SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND
IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE AND ITS
PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN
TO THIS PUBLICATION OR THE UNICODE WEBSITE. THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE
REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE
WEBSITE.
4. Waiver of Damages. In no event shall Unicode or its licensors be 4. Waiver of Damages. In no event shall Unicode or its licensors be
liable for any special, incidental, indirect or consequential damages of any liable for any special, incidental, indirect or consequential
kind, or any damages whatsoever, whether or not Unicode was advised of the damages of any kind, or any damages whatsoever, whether or not
possibility of the damage, including, without limitation, those resulting from Unicode was advised of the possibility of the damage, including,
the following: loss of use, data or profits, in connection with the use, without limitation, those resulting from the following: loss of use,
modification or distribution of this information or its derivatives. data or profits, in connection with the use, modification or
distribution of this information or its derivatives.
5. Trademarks. 5. Trademarks.
1. Unicode and the Unicode logo are registered trademarks of 1. Unicode and the Unicode logo are registered trademarks of
Unicode, Inc. Unicode, Inc.
2. This site contains product names and corporate names of other 2. This site contains product names and corporate names of
companies. All product names and company names and logos mentioned herein are other companies. All product names and company names and logos
the trademarks or registered trademarks of their respective owners. Other mentioned herein are the trademarks or registered trademarks
products and corporate names mentioned herein which are trademarks of a third of their respective owners. Other products and corporate names
party are used only for explanation and for the owners' benefit and with no mentioned herein which are trademarks of a third party are
intent to infringe. used only for explanation and for the owners' benefit and with
3. Use of third party products or information referred to herein is no intent to infringe.
at the user’s risk. 3. Use of third party products or information referred to
herein is at the user's risk.
6. Miscellaneous. 6. Miscellaneous.
1. Jurisdiction and Venue. This server is operated from a location 1. Jurisdiction and Venue. This server is operated from a
in the State of California, United States of America. Unicode makes no location in the State of California, United States of America.
representation that the materials are appropriate for use in other locations. If Unicode makes no representation that the materials are
you access this server from other locations, you are responsible for compliance appropriate for use in other locations. If you access this
with local laws. This Agreement, all use of this site and any claims and damages server from other locations, you are responsible for
resulting from use of this site are governed solely by the laws of the State of compliance with local laws. This Agreement, all use of this
California without regard to any principles which would apply the laws of a site and any claims and damages resulting from use of this
different jurisdiction. The user agrees that any disputes regarding this site site are governed solely by the laws of the State of
shall be resolved solely in the courts located in Santa Clara County, California without regard to any principles which would apply
California. The user agrees said courts have personal jurisdiction and agree to the laws of a different jurisdiction. The user agrees that any
waive any right to transfer the dispute to any other forum. disputes regarding this site shall be resolved solely in the
2. Modification by Unicode Unicode shall have the right to modify courts located in Santa Clara County, California. The user
this Agreement at any time by posting it to this site. The user may not assign agrees said courts have personal jurisdiction and agree to
any part of this Agreement without Unicode’s prior written consent. waive any right to transfer the dispute to any other forum.
3. Taxes. The user agrees to pay any taxes arising from access to 2. Modification by Unicode Unicode shall have the right to
this website or use of the information herein, except for those based on modify this Agreement at any time by posting it to this site.
Unicode’s net income. The user may not assign any part of this Agreement without
4. Severability. If any provision of this Agreement is declared Unicode's prior written consent.
invalid or unenforceable, the remaining provisions of this Agreement shall 3. Taxes. The user agrees to pay any taxes arising from access
remain in effect. to this website or use of the information herein, except for
those based on Unicode's net income.
4. Severability. If any provision of this Agreement is
declared invalid or unenforceable, the remaining provisions of
this Agreement shall remain in effect.
5. Entire Agreement. This Agreement constitutes the entire 5. Entire Agreement. This Agreement constitutes the entire
agreement between the parties. agreement between the parties.
EXHIBIT 1 EXHIBIT 1
UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
...@@ -1666,7 +1619,7 @@ OR SOFTWARE. ...@@ -1666,7 +1619,7 @@ OR SOFTWARE.
COPYRIGHT AND PERMISSION NOTICE COPYRIGHT AND PERMISSION NOTICE
Copyright © 1991-2008 Unicode, Inc. All rights reserved. Distributed under Copyright (c) 1991-2008 Unicode, Inc. All rights reserved. Distributed under
the Terms of Use in http://www.unicode.org/copyright.html. the Terms of Use in http://www.unicode.org/copyright.html.
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
...@@ -2265,7 +2218,7 @@ http://src.opensolaris.org/source/xref//sfw/usr/src/cmd/gdb/gdb-6.3/include/ieee ...@@ -2265,7 +2218,7 @@ http://src.opensolaris.org/source/xref//sfw/usr/src/cmd/gdb/gdb-6.3/include/ieee
/* IEEE Standard 695-1980 "Universal Format for Object Modules" /* IEEE Standard 695-1980 "Universal Format for Object Modules"
header file header file
Contributed by Cygnus Support. */ Contributed by Cygnus Support. */
*************************************************************************** ***************************************************************************
...@@ -2295,8 +2248,7 @@ Use of any of this software is governed by the terms of the license below: ...@@ -2295,8 +2248,7 @@ Use of any of this software is governed by the terms of the license below:
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
02111-1307, USA.
*/ */
********************************************************************** **********************************************************************
\ No newline at end of file
client/mysqltest.cc
View file @ 7bdecb1d
...@@ -444,7 +444,7 @@ struct st_command ...@@ -444,7 +444,7 @@ struct st_command
char *query, *query_buf,*first_argument,*last_argument,*end; char *query, *query_buf,*first_argument,*last_argument,*end;
DYNAMIC_STRING content; DYNAMIC_STRING content;
int first_word_len, query_len; int first_word_len, query_len;
my_bool abort_on_error; my_bool abort_on_error, used_replace;
struct st_expected_errors expected_errors; struct st_expected_errors expected_errors;
char require_file[FN_REFLEN]; char require_file[FN_REFLEN];
enum enum_commands type; enum enum_commands type;
...@@ -3287,7 +3287,7 @@ static int get_list_files(DYNAMIC_STRING *ds, const DYNAMIC_STRING *ds_dirname, ...@@ -3287,7 +3287,7 @@ static int get_list_files(DYNAMIC_STRING *ds, const DYNAMIC_STRING *ds_dirname,
if (ds_wild && ds_wild->length && if (ds_wild && ds_wild->length &&
wild_compare(file->name, ds_wild->str, 0)) wild_compare(file->name, ds_wild->str, 0))
continue; continue;
dynstr_append(ds, file->name); replace_dynstr_append(ds, file->name);
dynstr_append(ds, "\n"); dynstr_append(ds, "\n");
} }
set_wild_chars(0); set_wild_chars(0);
...@@ -3317,6 +3317,7 @@ static void do_list_files(struct st_command *command) ...@@ -3317,6 +3317,7 @@ static void do_list_files(struct st_command *command)
{"file", ARG_STRING, FALSE, &ds_wild, "Filename (incl. wildcard)"} {"file", ARG_STRING, FALSE, &ds_wild, "Filename (incl. wildcard)"}
}; };
DBUG_ENTER("do_list_files"); DBUG_ENTER("do_list_files");
command->used_replace= 1;
check_command_args(command, command->first_argument, check_command_args(command, command->first_argument,
list_files_args, list_files_args,
...@@ -3358,6 +3359,7 @@ static void do_list_files_write_file_command(struct st_command *command, ...@@ -3358,6 +3359,7 @@ static void do_list_files_write_file_command(struct st_command *command,
{"file", ARG_STRING, FALSE, &ds_wild, "Filename (incl. wildcard)"} {"file", ARG_STRING, FALSE, &ds_wild, "Filename (incl. wildcard)"}
}; };
DBUG_ENTER("do_list_files_write_file"); DBUG_ENTER("do_list_files_write_file");
command->used_replace= 1;
check_command_args(command, command->first_argument, check_command_args(command, command->first_argument,
list_files_args, list_files_args,
...@@ -8404,7 +8406,7 @@ int main(int argc, char **argv) ...@@ -8404,7 +8406,7 @@ int main(int argc, char **argv)
memset(&saved_expected_errors, 0, sizeof(saved_expected_errors)); memset(&saved_expected_errors, 0, sizeof(saved_expected_errors));
} }
if (command_executed != last_command_executed) if (command_executed != last_command_executed || command->used_replace)
{ {
/* /*
As soon as any command has been executed, As soon as any command has been executed,
......
mysql-test/r/ctype_latin1.result
View file @ 7bdecb1d
...@@ -409,3 +409,11 @@ select hex(cast(_ascii 0x7f as char(1) character set latin1)); ...@@ -409,3 +409,11 @@ select hex(cast(_ascii 0x7f as char(1) character set latin1));
hex(cast(_ascii 0x7f as char(1) character set latin1)) hex(cast(_ascii 0x7f as char(1) character set latin1))
7F 7F
End of 5.0 tests End of 5.0 tests
#
# Bug#58022 ... like ... escape export_set ( ... ) crashes when export_set returns warnings
#
SELECT '' LIKE '' ESCAPE EXPORT_SET(1, 1, 1, 1, '');
'' LIKE '' ESCAPE EXPORT_SET(1, 1, 1, 1, '')
1
Warnings:
Warning 1292 Truncated incorrect INTEGER value: ''
mysql-test/r/ctype_ujis.result
View file @ 7bdecb1d
...@@ -2374,6 +2374,16 @@ hex(convert(_latin1 0xA4A2 using ujis)) hex(c2) ...@@ -2374,6 +2374,16 @@ hex(convert(_latin1 0xA4A2 using ujis)) hex(c2)
DROP PROCEDURE sp1; DROP PROCEDURE sp1;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
#
# Bug#57257 Replace(ExtractValue(...)) causes MySQL crash
#
SET NAMES utf8;
SELECT CONVERT(REPLACE(EXPORT_SET('a','a','a','','a'),'00','') USING ujis);
CONVERT(REPLACE(EXPORT_SET('a','a','a','','a'),'00','') USING ujis)
Warnings:
Warning 1292 Truncated incorrect INTEGER value: 'a'
Warning 1292 Truncated incorrect INTEGER value: 'a'
set names default; set names default;
set character_set_database=default; set character_set_database=default;
set character_set_server=default; set character_set_server=default;
mysql-test/r/date_formats.result
View file @ 7bdecb1d
...@@ -609,3 +609,17 @@ SELECT DATE_FORMAT("2009-01-01",'%W %d %M %Y') as valid_date; ...@@ -609,3 +609,17 @@ SELECT DATE_FORMAT("2009-01-01",'%W %d %M %Y') as valid_date;
valid_date valid_date
Thursday 01 January 2009 Thursday 01 January 2009
"End of 5.0 tests" "End of 5.0 tests"
#
# Start of 5.1 tests
#
#
# Bug#58005 utf8 + get_format causes failed assertion: !str || str != Ptr'
#
SET NAMES utf8;
SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535)));
LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535)))
%
SET NAMES latin1;
#
# End of 5.1 tests
#
mysql-test/r/mysqltest.result
View file @ 7bdecb1d
...@@ -804,7 +804,7 @@ drop table t1; ...@@ -804,7 +804,7 @@ drop table t1;
mysqltest: At line 1: change user failed: Unknown database 'inexistent' mysqltest: At line 1: change user failed: Unknown database 'inexistent'
mysqltest: At line 1: change user failed: Access denied for user 'inexistent'@'localhost' (using password: NO) mysqltest: At line 1: change user failed: Access denied for user 'inexistent'@'localhost' (using password: NO)
mysqltest: At line 1: change user failed: Access denied for user 'root'@'localhost' (using password: YES) mysqltest: At line 1: change user failed: Access denied for user 'root'@'localhost' (using password: YES)
file1.txt REPLACED_FILE1.txt
file1.txt file1.txt
file2.txt file2.txt
file11.txt file11.txt
......
mysql-test/r/partition_innodb_plugin.result
View file @ 7bdecb1d
call mtr.add_suppression("nnoDB: Error: table `test`.`t1` .* Partition.* InnoDB internal");
#
# Bug#55091: Server crashes on ADD PARTITION after a failed attempt
#
SET @old_innodb_file_format_check = @@global.innodb_file_format_check;
SET @old_innodb_file_format = @@global.innodb_file_format;
SET @old_innodb_file_per_table = @@global.innodb_file_per_table;
SET @old_innodb_strict_mode = @@global.innodb_strict_mode;
SET @@global.innodb_file_format = Barracuda,
@@global.innodb_file_per_table = ON,
@@global.innodb_strict_mode = ON;
# Connection con1
CREATE TABLE t1 (id INT NOT NULL
PRIMARY KEY,
user_num CHAR(10)
) ENGINE = InnoDB
KEY_BLOCK_SIZE=4
PARTITION BY HASH(id) PARTITIONS 1;
t1#P#p0.ibd
t1.frm
t1.par
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`id` int(11) NOT NULL,
`user_num` char(10) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4
/*!50100 PARTITION BY HASH (id)
PARTITIONS 1 */
SET GLOBAL innodb_file_per_table = OFF;
# Connection con2
LOCK TABLE t1 WRITE;
# ALTER fails because COMPRESSED/KEY_BLOCK_SIZE
# are incompatible with innodb_file_per_table = OFF;
ALTER TABLE t1 ADD PARTITION PARTITIONS 1;
ERROR HY000: Got error 1478 from storage engine
t1#P#p0.ibd
t1.frm
t1.par
# This SET is not needed to reproduce the bug,
# it is here just to make the test case more realistic
SET innodb_strict_mode = OFF;
ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
Warnings:
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=4.
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=4.
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=4.
t1.frm
t1.par
ALTER TABLE t1 REBUILD PARTITION p0;
Warnings:
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
Warning 1478 InnoDB: ignoring KEY_BLOCK_SIZE=4.
UNLOCK TABLES;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`id` int(11) NOT NULL,
`user_num` char(10) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=4
/*!50100 PARTITION BY HASH (id)
PARTITIONS 3 */
DROP TABLE t1;
# Connection default
SET @@global.innodb_strict_mode = @old_innodb_strict_mode;
SET @@global.innodb_file_format = @old_innodb_file_format;
SET @@global.innodb_file_per_table = @old_innodb_file_per_table;
SET @@global.innodb_file_format_check = @old_innodb_file_format_check;
SET NAMES utf8; SET NAMES utf8;
CREATE TABLE `t``\""e` (a INT, PRIMARY KEY (a)) CREATE TABLE `t``\""e` (a INT, PRIMARY KEY (a))
ENGINE=InnoDB ENGINE=InnoDB
......
mysql-test/r/xml.result
View file @ 7bdecb1d
...@@ -1094,6 +1094,19 @@ Warning 1525 Incorrect XML value: 'parse error at line 1 pos 23: unexpected END- ...@@ -1094,6 +1094,19 @@ Warning 1525 Incorrect XML value: 'parse error at line 1 pos 23: unexpected END-
Warning 1525 Incorrect XML value: 'parse error at line 1 pos 23: unexpected END-OF-INPUT' Warning 1525 Incorrect XML value: 'parse error at line 1 pos 23: unexpected END-OF-INPUT'
DROP TABLE t1; DROP TABLE t1;
# #
# Bug#57257 Replace(ExtractValue(...)) causes MySQL crash
#
SET NAMES utf8;
SELECT REPLACE(EXTRACTVALUE('1', '/a'),'ds','');
REPLACE(EXTRACTVALUE('1', '/a'),'ds','')
#
# Bug #57820 extractvalue crashes
#
SELECT AVG(DISTINCT EXTRACTVALUE((''),('$@k')));
AVG(DISTINCT EXTRACTVALUE((''),('$@k')))
NULL
#
# Bug#57279 updatexml dies with: Assertion failed: str_arg[length] == 0 # Bug#57279 updatexml dies with: Assertion failed: str_arg[length] == 0
# #
SELECT UPDATEXML(NULL, (LPAD(0.1111E-15, '2011', 1)), 1); SELECT UPDATEXML(NULL, (LPAD(0.1111E-15, '2011', 1)), 1);
......
mysql-test/suite/binlog/t/disabled.def
View file @ 7bdecb1d
...@@ -10,5 +10,4 @@ ...@@ -10,5 +10,4 @@
# #
############################################################################## ##############################################################################
binlog_truncate_innodb : BUG#57291 2010-10-20 anitha Originally disabled due to BUG#42643. Product bug fixed, but test changes needed binlog_truncate_innodb : BUG#57291 2010-10-20 anitha Originally disabled due to BUG#42643. Product bug fixed, but test changes needed
binlog_row_failure_mixing_engines : BUG#58416 2010-11-23 ramil Fails on win x86 debug_max
mysql-test/t/ctype_latin1.test
View file @ 7bdecb1d
...@@ -127,3 +127,8 @@ DROP TABLE `abc ...@@ -127,3 +127,8 @@ DROP TABLE `abc
select hex(cast(_ascii 0x7f as char(1) character set latin1)); select hex(cast(_ascii 0x7f as char(1) character set latin1));
--echo End of 5.0 tests --echo End of 5.0 tests
--echo #
--echo # Bug#58022 ... like ... escape export_set ( ... ) crashes when export_set returns warnings
--echo #
SELECT '' LIKE '' ESCAPE EXPORT_SET(1, 1, 1, 1, '');
mysql-test/t/ctype_ujis.test
View file @ 7bdecb1d
...@@ -1209,6 +1209,13 @@ DROP PROCEDURE sp1; ...@@ -1209,6 +1209,13 @@ DROP PROCEDURE sp1;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
--echo #
--echo # Bug#57257 Replace(ExtractValue(...)) causes MySQL crash
--echo #
SET NAMES utf8;
SELECT CONVERT(REPLACE(EXPORT_SET('a','a','a','','a'),'00','') USING ujis);
set names default; set names default;
set character_set_database=default; set character_set_database=default;
set character_set_server=default; set character_set_server=default;
mysql-test/t/date_formats.test
View file @ 7bdecb1d
...@@ -359,3 +359,19 @@ SELECT DATE_FORMAT("0000-02-28",'%W %d %M %Y') as valid_date; ...@@ -359,3 +359,19 @@ SELECT DATE_FORMAT("0000-02-28",'%W %d %M %Y') as valid_date;
SELECT DATE_FORMAT("2009-01-01",'%W %d %M %Y') as valid_date; SELECT DATE_FORMAT("2009-01-01",'%W %d %M %Y') as valid_date;
--echo "End of 5.0 tests" --echo "End of 5.0 tests"
--echo #
--echo # Start of 5.1 tests
--echo #
--echo #
--echo # Bug#58005 utf8 + get_format causes failed assertion: !str || str != Ptr'
--echo #
SET NAMES utf8;
SELECT LEAST('%', GET_FORMAT(datetime, 'eur'), CAST(GET_FORMAT(datetime, 'eur') AS CHAR(65535)));
SET NAMES latin1;
--echo #
--echo # End of 5.1 tests
--echo #
mysql-test/t/mysqltest.test
View file @ 7bdecb1d
...@@ -2513,6 +2513,8 @@ write_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt; ...@@ -2513,6 +2513,8 @@ write_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt;
hello hello
EOF EOF
# Verify that --replace_result also work on list_files
--replace_result file REPLACED_FILE
list_files $MYSQLTEST_VARDIR/tmp/testdir; list_files $MYSQLTEST_VARDIR/tmp/testdir;
# list_files gets the directory list before creating the new file # list_files gets the directory list before creating the new file
list_files_write_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir *; list_files_write_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir *;
......
mysql-test/t/partition_innodb_plugin.test
View file @ 7bdecb1d
--source include/have_partition.inc --source include/have_partition.inc
--source include/have_innodb_plugin.inc --source include/have_innodb_plugin.inc
# Remove the line below when bug#53307 is solved.
--source include/not_valgrind.inc
let $MYSQLD_DATADIR= `SELECT @@datadir`;
call mtr.add_suppression("nnoDB: Error: table `test`.`t1` .* Partition.* InnoDB internal");
--echo #
--echo # Bug#55091: Server crashes on ADD PARTITION after a failed attempt
--echo #
SET @old_innodb_file_format_check = @@global.innodb_file_format_check;
SET @old_innodb_file_format = @@global.innodb_file_format;
SET @old_innodb_file_per_table = @@global.innodb_file_per_table;
SET @old_innodb_strict_mode = @@global.innodb_strict_mode;
SET @@global.innodb_file_format = Barracuda,
@@global.innodb_file_per_table = ON,
@@global.innodb_strict_mode = ON;
--echo # Connection con1
--connect(con1,localhost,root,,)
CREATE TABLE t1 (id INT NOT NULL
PRIMARY KEY,
user_num CHAR(10)
) ENGINE = InnoDB
KEY_BLOCK_SIZE=4
PARTITION BY HASH(id) PARTITIONS 1;
--replace_result #p# #P#
--list_files $MYSQLD_DATADIR/test
SHOW CREATE TABLE t1;
SET GLOBAL innodb_file_per_table = OFF;
--disconnect con1
--connect(con2,localhost,root,,)
--echo # Connection con2
LOCK TABLE t1 WRITE;
--echo # ALTER fails because COMPRESSED/KEY_BLOCK_SIZE
--echo # are incompatible with innodb_file_per_table = OFF;
--error ER_GET_ERRNO
ALTER TABLE t1 ADD PARTITION PARTITIONS 1;
--replace_result #p# #P#
--list_files $MYSQLD_DATADIR/test
--echo # This SET is not needed to reproduce the bug,
--echo # it is here just to make the test case more realistic
SET innodb_strict_mode = OFF;
ALTER TABLE t1 ADD PARTITION PARTITIONS 2;
--replace_result #p# #P#
--list_files $MYSQLD_DATADIR/test
# really bug#56172
ALTER TABLE t1 REBUILD PARTITION p0;
UNLOCK TABLES;
SHOW CREATE TABLE t1;
DROP TABLE t1;
--disconnect con2
--connection default
--echo # Connection default
SET @@global.innodb_strict_mode = @old_innodb_strict_mode;
SET @@global.innodb_file_format = @old_innodb_file_format;
SET @@global.innodb_file_per_table = @old_innodb_file_per_table;
SET @@global.innodb_file_format_check = @old_innodb_file_format_check;
# #
# Bug#32430 - show engine innodb status causes errors # Bug#32430 - show engine innodb status causes errors
......
mysql-test/t/xml.test
View file @ 7bdecb1d
...@@ -617,6 +617,20 @@ FROM t1 ORDER BY t1.id; ...@@ -617,6 +617,20 @@ FROM t1 ORDER BY t1.id;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # Bug#57257 Replace(ExtractValue(...)) causes MySQL crash
--echo #
SET NAMES utf8;
SELECT REPLACE(EXTRACTVALUE('1', '/a'),'ds','');
--echo #
--echo # Bug #57820 extractvalue crashes
--echo #
SELECT AVG(DISTINCT EXTRACTVALUE((''),('$@k')));
--echo # --echo #
--echo # Bug#57279 updatexml dies with: Assertion failed: str_arg[length] == 0 --echo # Bug#57279 updatexml dies with: Assertion failed: str_arg[length] == 0
--echo # --echo #
......
sql/item_cmpfunc.cc
View file @ 7bdecb1d
...@@ -4692,6 +4692,7 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) ...@@ -4692,6 +4692,7 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref)
String *escape_str= escape_item->val_str(&cmp.value1); String *escape_str= escape_item->val_str(&cmp.value1);
if (escape_str) if (escape_str)
{ {
const char *escape_str_ptr= escape_str->ptr();
if (escape_used_in_parsing && ( if (escape_used_in_parsing && (
(((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) && (((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) &&
escape_str->numchars() != 1) || escape_str->numchars() != 1) ||
...@@ -4706,9 +4707,9 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) ...@@ -4706,9 +4707,9 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref)
CHARSET_INFO *cs= escape_str->charset(); CHARSET_INFO *cs= escape_str->charset();
my_wc_t wc; my_wc_t wc;
int rc= cs->cset->mb_wc(cs, &wc, int rc= cs->cset->mb_wc(cs, &wc,
(const uchar*) escape_str->ptr(), (const uchar*) escape_str_ptr,
(const uchar*) escape_str->ptr() + (const uchar*) escape_str_ptr +
escape_str->length()); escape_str->length());
escape= (int) (rc > 0 ? wc : '\\'); escape= (int) (rc > 0 ? wc : '\\');
} }
else else
...@@ -4725,13 +4726,13 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) ...@@ -4725,13 +4726,13 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref)
{ {
char ch; char ch;
uint errors; uint errors;
uint32 cnvlen= copy_and_convert(&ch, 1, cs, escape_str->ptr(), uint32 cnvlen= copy_and_convert(&ch, 1, cs, escape_str_ptr,
escape_str->length(), escape_str->length(),
escape_str->charset(), &errors); escape_str->charset(), &errors);
escape= cnvlen ? ch : '\\'; escape= cnvlen ? ch : '\\';
} }
else else
escape= *(escape_str->ptr()); escape= escape_str_ptr ? *escape_str_ptr : '\\';
} }
} }
else else
......
sql/item_strfunc.cc
View file @ 7bdecb1d
...@@ -904,9 +904,15 @@ String *Item_func_replace::val_str(String *str) ...@@ -904,9 +904,15 @@ String *Item_func_replace::val_str(String *str)
search=res2->ptr(); search=res2->ptr();
search_end=search+from_length; search_end=search+from_length;
redo: redo:
DBUG_ASSERT(res->ptr() || !offset);
ptr=res->ptr()+offset; ptr=res->ptr()+offset;
strend=res->ptr()+res->length(); strend=res->ptr()+res->length();
end=strend-from_length+1; /*
In some cases val_str() can return empty string
with ptr() == NULL and length() == 0.
Let's check strend to avoid overflow.
*/
end= strend ? strend - from_length + 1 : NULL;
while (ptr < end) while (ptr < end)
{ {
if (*ptr == *search) if (*ptr == *search)
......
sql/item_timefunc.cc
View file @ 7bdecb1d
...@@ -2456,14 +2456,14 @@ String *Item_char_typecast::val_str(String *str) ...@@ -2456,14 +2456,14 @@ String *Item_char_typecast::val_str(String *str)
{ {
// Convert character set if differ // Convert character set if differ
uint dummy_errors; uint dummy_errors;
if (!(res= args[0]->val_str(&tmp_value)) || if (!(res= args[0]->val_str(str)) ||
str->copy(res->ptr(), res->length(), from_cs, tmp_value.copy(res->ptr(), res->length(), from_cs,
cast_cs, &dummy_errors)) cast_cs, &dummy_errors))
{ {
null_value= 1; null_value= 1;
return 0; return 0;
} }
res= str; res= &tmp_value;
} }
res->set_charset(cast_cs); res->set_charset(cast_cs);
...@@ -2497,9 +2497,9 @@ String *Item_char_typecast::val_str(String *str) ...@@ -2497,9 +2497,9 @@ String *Item_char_typecast::val_str(String *str)
{ {
if (res->alloced_length() < (uint) cast_length) if (res->alloced_length() < (uint) cast_length)
{ {
str->alloc(cast_length); str_value.alloc(cast_length);
str->copy(*res); str_value.copy(*res);
res= str; res= &str_value;
} }
bzero((char*) res->ptr() + res->length(), bzero((char*) res->ptr() + res->length(),
(uint) cast_length - res->length()); (uint) cast_length - res->length());
......
sql/item_xmlfunc.cc
View file @ 7bdecb1d
...@@ -2790,12 +2790,12 @@ String *Item_func_xml_extractvalue::val_str(String *str) ...@@ -2790,12 +2790,12 @@ String *Item_func_xml_extractvalue::val_str(String *str)
null_value= 0; null_value= 0;
if (!nodeset_func || if (!nodeset_func ||
!(res= args[0]->val_str(str)) || !(res= args[0]->val_str(str)) ||
!parse_xml(res, &pxml)) !parse_xml(res, &pxml) ||
!(res= nodeset_func->val_str(&tmp_value)))
{ {
null_value= 1; null_value= 1;
return 0; return 0;
} }
res= nodeset_func->val_str(&tmp_value);
return res; return res;
} }
......
sql/sql_partition.cc
View file @ 7bdecb1d
...@@ -5934,6 +5934,12 @@ static void alter_partition_lock_handling(ALTER_PARTITION_PARAM_TYPE *lpt) ...@@ -5934,6 +5934,12 @@ static void alter_partition_lock_handling(ALTER_PARTITION_PARAM_TYPE *lpt)
int err; int err;
if (lpt->thd->locked_tables) if (lpt->thd->locked_tables)
{ {
/*
Close the table if open, to remove/destroy the already altered
table->part_info object, so that it is not reused.
*/
if (lpt->table->db_stat)
abort_and_upgrade_lock_and_close_table(lpt);
/* /*
When we have the table locked, it is necessary to reopen the table When we have the table locked, it is necessary to reopen the table
since all table objects were closed and removed as part of the since all table objects were closed and removed as part of the
...@@ -6436,7 +6442,20 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, ...@@ -6436,7 +6442,20 @@ uint fast_alter_partition_table(THD *thd, TABLE *table,
table, table_list, FALSE, NULL, table, table_list, FALSE, NULL,
written_bin_log)); written_bin_log));
err: err:
close_thread_tables(thd); if (thd->locked_tables)
{
/*
table->part_info was altered in prep_alter_part_table and must be
destroyed and recreated, since otherwise it will be reused, since
we are under LOCK TABLE.
*/
alter_partition_lock_handling(lpt);
}
else
{
/* Force the table to be closed to avoid reuse of the table->part_info */
close_thread_tables(thd);
}
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7