Skip to content
GitLab
Commit bcf364b1 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files

Update upstream source from tag 'upstream/5.5.68' 

Update to upstream version '5.5.68'
with Debian dir 5f5aa9cc438fb1560369c865bc124c1214e8b073
parents 56320676 295a9903
Show whitespace changes
Inline Side-by-side
Docs/INFO_SRC
View file @ bcf364b1
commit: 926446880f937568eaae9a9671193d9d652f7bf9 commit: f20c63264ab4170fc8e45093042bd2e7272ce9fc
date: 2019-04-26 15:31:31 +0300 date: 2020-05-06 13:47:55 +0300
build-date: 2019-04-26 12:37:03 +0000 build-date: 2020-05-06 10:54:23 +0000
short: 9264468 short: f20c632
branch: HEAD branch: HEAD
MySQL source 5.5.64 MySQL source 5.5.68
README
View file @ bcf364b1
...@@ -220,7 +220,7 @@ cmake-2.4.8/Utilities/cmtar/compat/gethostname.c: ...@@ -220,7 +220,7 @@ cmake-2.4.8/Utilities/cmtar/compat/gethostname.c:
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., 51 Franklin Street, Fifth Floor, Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. Boston, MA 02110-1335 USA.
As a special exception, when this file is copied by Bison into a As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction. Bison output file, you may use that output file without restriction.
...@@ -610,7 +610,7 @@ ltmain.sh inclusion: ...@@ -610,7 +610,7 @@ ltmain.sh inclusion:
# #
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA.
# #
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
...@@ -641,7 +641,7 @@ libtool inclusion: ...@@ -641,7 +641,7 @@ libtool inclusion:
# #
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA.
# #
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
...@@ -673,7 +673,7 @@ Auto-generated files: ...@@ -673,7 +673,7 @@ Auto-generated files:
# #
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA.
# #
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
...@@ -699,7 +699,7 @@ GNU GENERAL PUBLIC LICENSE ...@@ -699,7 +699,7 @@ GNU GENERAL PUBLIC LICENSE
Version 2, June 1991 Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc. Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
...@@ -972,7 +972,7 @@ GNU General Public License for more details. ...@@ -972,7 +972,7 @@ GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA.
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
...@@ -1395,8 +1395,8 @@ text: ...@@ -1395,8 +1395,8 @@ text:
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 not, License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02111-1307, USA. */ Boston, MA 02110-1335 USA. */
...@@ -1737,7 +1737,7 @@ Use of any of this software is governed by the terms of the license below: ...@@ -1737,7 +1737,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 02111-1307 USA */ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* /*
* Copyright (c) 1997, 1999 Kungliga Tekniska H366gskolan * Copyright (c) 1997, 1999 Kungliga Tekniska H366gskolan
...@@ -1824,7 +1824,7 @@ GNU GENERAL PUBLIC LICENSE ...@@ -1824,7 +1824,7 @@ GNU GENERAL PUBLIC LICENSE
Version 2, June 1991 Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc., Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
...@@ -2127,7 +2127,7 @@ the "copyright" line and a pointer to where the full notice is found. ...@@ -2127,7 +2127,7 @@ the "copyright" line and a pointer to where the full notice is found.
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA.
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
......
VERSION
View file @ bcf364b1
MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5 MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=64 MYSQL_VERSION_PATCH=68
MYSQL_VERSION_EXTRA= MYSQL_VERSION_EXTRA=
client/CMakeLists.txt
View file @ bcf364b1
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# #
# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include
......
client/client_priv.h
View file @ bcf364b1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/ */
/* Common defines for all clients */ /* Common defines for all clients */
......
client/completion_hash.cc
View file @ bcf364b1
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Quick & light hash implementation for tab completion purposes /* Quick & light hash implementation for tab completion purposes
* *
......
client/completion_hash.h
View file @ bcf364b1
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
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 this library; if not, write to the Free License along with this library; if not, write to the Free
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA */ MA 02110-1335 USA */
#ifndef _HASH_ #ifndef _HASH_
#define _HASH_ #define _HASH_
......
client/echo.c
View file @ bcf364b1
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* /*
echo is a replacement for the "echo" command builtin to cmd.exe echo is a replacement for the "echo" command builtin to cmd.exe
......
client/get_password.c
View file @ bcf364b1
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* /*
** Ask for a password from tty ** Ask for a password from tty
......
client/my_readline.h
View file @ bcf364b1
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/ */
/* readline for batch mode */ /* readline for batch mode */
......
client/mysql.cc
View file @ bcf364b1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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 02111-1307 USA */ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* mysql command tool /* mysql command tool
* Commands compatible with mSQL by David J. Hughes * Commands compatible with mSQL by David J. Hughes
...@@ -3177,7 +3177,7 @@ static int ...@@ -3177,7 +3177,7 @@ static int
com_go(String *buffer,char *line __attribute__((unused))) com_go(String *buffer,char *line __attribute__((unused)))
{ {
char buff[200]; /* about 110 chars used so far */ char buff[200]; /* about 110 chars used so far */
char time_buff[52+3+1]; /* time max + space&parens + NUL */ char time_buff[52+3+1]; /* time max + space & parens + NUL */
MYSQL_RES *result; MYSQL_RES *result;
ulong timer, warnings= 0; ulong timer, warnings= 0;
uint error= 0; uint error= 0;
...@@ -3196,7 +3196,7 @@ com_go(String *buffer,char *line __attribute__((unused))) ...@@ -3196,7 +3196,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
if (buffer->is_empty()) if (buffer->is_empty())
{ {
if (status.batch) // Ignore empty quries if (status.batch) // Ignore empty queries.
return 0; return 0;
return put_info("No query specified\n",INFO_ERROR); return put_info("No query specified\n",INFO_ERROR);
...@@ -3261,7 +3261,7 @@ com_go(String *buffer,char *line __attribute__((unused))) ...@@ -3261,7 +3261,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
else else
time_buff[0]= '\0'; time_buff[0]= '\0';
/* Every branch must truncate buff . */ /* Every branch must truncate buff. */
if (result) if (result)
{ {
if (!mysql_num_rows(result) && ! quick && !column_types_flag) if (!mysql_num_rows(result) && ! quick && !column_types_flag)
......
client/mysql_plugin.c
View file @ bcf364b1
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
*/ */
#include <m_string.h> #include <m_string.h>
......
client/mysql_upgrade.c
View file @ bcf364b1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/ */
#include "client_priv.h" #include "client_priv.h"
......
client/mysqladmin.cc
View file @ bcf364b1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* maintaince of mysql databases */ /* maintaince of mysql databases */
......
client/mysqlbinlog.cc
View file @ bcf364b1
/* /*
Copyright (c) 2000, 2014, Oracle and/or its affiliates. Copyright (c) 2000, 2014, Oracle and/or its affiliates.
Copyright (c) 2009, 2014, MariaDB Copyright (c) 2009, 2020, MariaDB
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
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/ */
/* /*
...@@ -151,7 +151,7 @@ enum Exit_status { ...@@ -151,7 +151,7 @@ enum Exit_status {
*/ */
static Annotate_rows_log_event *annotate_event= NULL; static Annotate_rows_log_event *annotate_event= NULL;
void free_annotate_event() static void free_annotate_event()
{ {
if (annotate_event) if (annotate_event)
{ {
......
client/mysqlcheck.c
View file @ bcf364b1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/ */
/* By Jani Tolonen, 2001-04-20, MySQL Development Team */ /* By Jani Tolonen, 2001-04-20, MySQL Development Team */
......
client/mysqldump.c
View file @ bcf364b1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
*/ */
/* mysqldump.c - Dump a tables contents and format to an ASCII file /* mysqldump.c - Dump a tables contents and format to an ASCII file
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
** master/autocommit code by Brian Aker <brian@tangent.org> ** master/autocommit code by Brian Aker <brian@tangent.org>
** SSL by ** SSL by
** Andrei Errapart <andreie@no.spam.ee> ** Andrei Errapart <andreie@no.spam.ee>
** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee> ** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee>
** XML by Gary Huntress <ghuntress@mediaone.net> 10/10/01, cleaned up ** XML by Gary Huntress <ghuntress@mediaone.net> 10/10/01, cleaned up
** and adapted to mysqldump 05/11/01 by Jani Tolonen ** and adapted to mysqldump 05/11/01 by Jani Tolonen
** Added --single-transaction option 06/06/2002 by Peter Zaitsev ** Added --single-transaction option 06/06/2002 by Peter Zaitsev
......
client/mysqlimport.c
View file @ bcf364b1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/ */
/* /*
......
client/mysqlshow.c
View file @ bcf364b1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/ */
/* Show databases, tables or columns */ /* Show databases, tables or columns */
......
client/mysqlslap.c
View file @ bcf364b1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/ */
/* /*
......
Supports Markdown
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