Merge 10.1 into 10.2

cmake/cpack_rpm.cmake

@@ -37,7 +37,7 @@ IF(CMAKE_VERSION VERSION_LESS "3.6.0")
   SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
 ELSE()
   SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
-  SET(CPACK_RPM_DEBUGINFO_PACKAGE ON)
+  SET(CPACK_RPM_DEBUGINFO_PACKAGE ON CACHE INTERNAL "")
 ENDIF()
 
 SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")

debian/po/ca.po

@@ -203,13 +203,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "El MySQL només s'instal·la en cas de tenir un nom d'ordinador central que "
 #~ "no sigui numèric  i que es pugui resoldre a través del fitxer /etc/hosts. "
 #~ "Ex. si l'ordre \"hostname\" retorna \"myhostname\", llavors hi ha d'haver "
-#~ "una línia com la següent \"10.2.0.1 myhostname\"."
+#~ "una línia com la següent \"10.0.0.1 myhostname\"."
 
 #, fuzzy
 #~ msgid ""

debian/po/cs.po

@@ -310,13 +310,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL se nainstaluje pouze v případě, že používáte nenumerické jméno "
 #~ "počítače, které se dá přeložit přes soubor /etc/hosts. Např. když příkaz "
 #~ "\"hostname\" vrátí \"diamond\", tak v /etc/hosts musí existovat obdobný "
-#~ "řádek jako \"10.2.0.1 diamond\"."
+#~ "řádek jako \"10.0.0.1 diamond\"."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "

debian/po/da.po

@@ -336,12 +336,12 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL vil kun blive installeret, hvis du har et ikke-numerisk værtsnavn, "
 #~ "som kan slås op i filen /ets/hosts. Hvis f.eks. kommandoen \"hostname\" "
-#~ "svarer med \"mitvaertsnavn\", skal du have en linje a'la \"10.2.0.1 "
+#~ "svarer med \"mitvaertsnavn\", skal du have en linje a'la \"10.0.0.1 "
 #~ "mitvaertsnavn\" i /etc/hosts."
 
 #~ msgid ""

debian/po/es.po

@@ -354,13 +354,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "Sólo se instalará MySQL si tiene un nombre de equipo que no sea una "
 #~ "dirección IP y pueda resolverse a través del archivo /etc/hosts. Por "
 #~ "ejemplo, si la orden «hostname» devuelve «MiNombreEquipo» entonces deberá "
-#~ "existir una línea «10.2.0.1 MiNombreEquipo» en dicho archivo."
+#~ "existir una línea «10.0.0.1 MiNombreEquipo» en dicho archivo."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "

debian/po/pt_BR.po

@@ -322,13 +322,13 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "O MySQL será instalado somente caso você possua um nome de host NÃO "
 #~ "NUMÉRICO que possa ser resolvido através do arquivo /etc/hosts, ou seja, "
 #~ "caso o comando \"hostname\" retorne \"myhostname\", uma linha como "
-#~ "\"10.2.0.1 myhostname\" deverá existir no arquivo /etc/hosts."
+#~ "\"10.0.0.1 myhostname\" deverá existir no arquivo /etc/hosts."
 
 #~ msgid ""
 #~ "A new mysql user \"debian-sys-maint\" will be created. This mysql account "

debian/po/tr.po

@@ -202,12 +202,12 @@ msgstr ""
 #~ msgid ""
 #~ "MySQL will only install if you have a non-numeric hostname that is "
 #~ "resolvable via the /etc/hosts file. E.g. if the \"hostname\" command "
-#~ "returns \"myhostname\" then there must be a line like \"10.2.0.1 "
+#~ "returns \"myhostname\" then there must be a line like \"10.0.0.1 "
 #~ "myhostname\"."
 #~ msgstr ""
 #~ "MySQL sadece /etc/hosts dosyası yoluyla çözülebilir NUMERİK OLMAYAN bir "
 #~ "makine adına sahipseniz kurulacaktır. Örneğin, eğer \"hostname\" komutu "
-#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.2.0.1 makinem\" "
+#~ "\"makinem\" ismini döndürüyorsa, bu dosya içinde \"10.0.0.1 makinem\" "
 #~ "gibi bir satır olmalıdır."
 
 #, fuzzy

include/my_valgrind.h

@@ -1,4 +1,4 @@
-/* Copyright (C) 2010, 2017, MariaDB Corporation.
+/* Copyright (C) 2010, 2019, MariaDB Corporation.
 
    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
@@ -13,6 +13,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
+#ifndef MY_VALGRIND_INCLUDED
+#define MY_VALGRIND_INCLUDED
+
 /* clang -> gcc */
 #ifndef __has_feature
 # define __has_feature(x) 0
@@ -33,6 +36,7 @@
 # define MEM_NOACCESS(a,len) VALGRIND_MAKE_MEM_NOACCESS(a,len)
 # define MEM_CHECK_ADDRESSABLE(a,len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,len)
 # define MEM_CHECK_DEFINED(a,len) VALGRIND_CHECK_MEM_IS_DEFINED(a,len)
+# define REDZONE_SIZE 8
 #elif defined(__SANITIZE_ADDRESS__)
 # include <sanitizer/asan_interface.h>
 /* How to do manual poisoning:
@@ -41,11 +45,13 @@
 # define MEM_NOACCESS(a,len) ASAN_POISON_MEMORY_REGION(a,len)
 # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
 # define MEM_CHECK_DEFINED(a,len) ((void) 0)
+# define REDZONE_SIZE 8
 #else
 # define MEM_UNDEFINED(a,len) ((void) (a), (void) (len))
 # define MEM_NOACCESS(a,len) ((void) 0)
 # define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
 # define MEM_CHECK_DEFINED(a,len) ((void) 0)
+# define REDZONE_SIZE 0
 #endif /* HAVE_VALGRIND_MEMCHECK_H */
 
 #ifndef DBUG_OFF
@@ -56,3 +62,5 @@
 
 #define TRASH_ALLOC(A,B) do { TRASH_FILL(A,B,0xA5); MEM_UNDEFINED(A,B); } while(0)
 #define TRASH_FREE(A,B) do { TRASH_FILL(A,B,0x8F); MEM_NOACCESS(A,B); } while(0)
+
+#endif /* MY_VALGRIND_INCLUDED */

man/mysqlimport.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\FBMYSQLIMPORT\FR" "1" "3 April 2017" "MariaDB 10\&.2" "MariaDB Database System"
+.TH "\FBMYSQLIMPORT\FR" "1" "21 May 2019" "MariaDB 10\&.2" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -346,6 +346,22 @@ option\&.
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: ignore-foreign-keys option
+.\" ignore-foreign-keys option: mysqlimport
+\fB\-\-ignore\-foreign\-keys\fR,
+\fB\-k\fR
+.sp
+Disable foreign key checks while importing the data\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: ignore-lines option
 .\" ignore-lines option: mysqlimport
 \fB\-\-ignore\-lines=\fR\fB\fIN\fR\fR