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

Update changelog and refresh patches after 10.1.29 import

parent 20fb35b0
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ 8895c70e
mariadb-10.1 (10.1.29-1) unstable; urgency=medium
* New upstream version 10.1.29, includes fixes for the following
security vulnerabilities:
- [CVE-2017-10378]: Optimizer component to cause denial of service
conditions
- [CVE-2017-10268]: Replication component to access data
- [MDEV-13819]: Server crashes in Item_func_in::val_int or Assertion
`in_item' failed in virtual longlong Item_func_in::val_int
* Refresh debian/patches on top of MariaDB 10.1.29 release
-- Otto Kekäläinen <otto@debian.org> Sat, 18 Nov 2017 16:42:25 +0800
mariadb-10.1 (10.1.28-1) unstable; urgency=medium
* New upstream version 10.1.28
......
debian/patches/armhf_mroonga_storage_fail.patch
View file @ 8895c70e
......@@ -6,11 +6,9 @@ Subject: armhf_mroonga_storage_fail
storage/mroonga/lib/mrn_multiple_column_key_codec.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp b/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
index c7ef9dd..b6ad631 100644
--- a/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
+++ b/storage/mroonga/lib/mrn_multiple_column_key_codec.cpp
@@ -612,9 +612,10 @@ namespace mrn {
@@ -621,9 +621,10 @@ namespace mrn {
long long int long_long_value;
mrn_byte_order_network_to_host(&long_long_value, grn_key, grn_key_size);
int max_bit = (grn_key_size * 8 - 1);
......
debian/patches/c11_atomics.patch
View file @ 8895c70e
......@@ -121,11 +121,9 @@ index eb7f75e..a9221d7 100644
IF (WIN32)
TARGET_LINK_LIBRARIES(mysys IPHLPAPI)
ENDIF(WIN32)
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index b4acac5..8247714 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS}
@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
${SSL_LIBRARIES}
${LIBSYSTEMD})
......
debian/patches/fix-FTBFS-on-GNU-Hurd.patch
View file @ 8895c70e
......@@ -13,8 +13,6 @@ Subject: fix-FTBFS-on-GNU-Hurd
storage/mroonga/vendor/groonga/lib/grn_com.h | 24 ++++++++-------
8 files changed, 86 insertions(+), 37 deletions(-)
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake
index 3edcdc4..c090d65 100644
--- a/cmake/dtrace.cmake
+++ b/cmake/dtrace.cmake
@@ -45,6 +45,10 @@ MACRO(CHECK_DTRACE)
......@@ -28,8 +26,6 @@ index 3edcdc4..c090d65 100644
SET(HAVE_DTRACE ${ENABLE_DTRACE})
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index 7681f78..2a9b1e1 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -81,6 +81,9 @@ IF(NOT VERSION)
......@@ -42,8 +38,6 @@ index 7681f78..2a9b1e1 100644
ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
IF(CMAKE_OSX_DEPLOYMENT_TARGET)
SET(DEFAULT_PLATFORM "osx${CMAKE_OSX_DEPLOYMENT_TARGET}")
diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
index 156e0b2..bb9c79c 100644
--- a/extra/mariabackup/backup_copy.cc
+++ b/extra/mariabackup/backup_copy.cc
@@ -623,11 +623,13 @@ static
......@@ -63,7 +57,7 @@ index 156e0b2..bb9c79c 100644
for (p = parent + strlen(parent);
!is_path_separator(*p) && p != parent; p--);
@@ -636,19 +638,23 @@ mkdirp(const char *pathname, int Flags, myf MyFlags)
@@ -636,19 +638,23 @@ mkdirp(const char *pathname, int Flags,
/* try to make parent directory */
if (p != parent && mkdirp(parent, Flags, MyFlags) != 0) {
......@@ -117,8 +111,6 @@ index 156e0b2..bb9c79c 100644
#else
return strcmp(first, second) == 0;
#endif
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h
index 892e091..9bf44e0 100644
--- a/mysys/mysys_priv.h
+++ b/mysys/mysys_priv.h
@@ -16,6 +16,10 @@
......@@ -141,7 +133,7 @@ index 892e091..9bf44e0 100644
#define O_PATH O_EXEC
#endif
#endif
@@ -128,8 +132,8 @@ const char *my_open_parent_dir_nosymlinks(const char *pathname, int *pdfd);
@@ -128,8 +132,8 @@ const char *my_open_parent_dir_nosymlink
return res;
#elif defined(HAVE_REALPATH) && defined(PATH_MAX)
#define NOSYMLINK_FUNCTION_BODY(AT,NOAT) \
......@@ -152,11 +144,9 @@ index 892e091..9bf44e0 100644
if (strcmp(pathname, buf)) { errno= ENOTDIR; return -1; } \
return NOAT;
#elif defined(HAVE_REALPATH)
diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc
index 998f4e7..784b235 100644
--- a/sql/wsrep_binlog.cc
+++ b/sql/wsrep_binlog.cc
@@ -318,13 +318,23 @@ int wsrep_write_cache(wsrep_t* const wsrep,
@@ -318,13 +318,23 @@ int wsrep_write_cache(wsrep_t* const ws
void wsrep_dump_rbr_buf(THD *thd, const void* rbr_buf, size_t buf_len)
{
......@@ -184,7 +174,7 @@ index 998f4e7..784b235 100644
return;
}
@@ -343,6 +353,7 @@ void wsrep_dump_rbr_buf(THD *thd, const void* rbr_buf, size_t buf_len)
@@ -343,6 +353,7 @@ void wsrep_dump_rbr_buf(THD *thd, const
WSREP_ERROR("Failed to open file '%s': %d (%s)",
filename, errno, strerror(errno));
}
......@@ -192,7 +182,7 @@ index 998f4e7..784b235 100644
}
/*
@@ -448,19 +459,29 @@ void wsrep_dump_rbr_buf_with_header(THD *thd, const void *rbr_buf,
@@ -448,19 +459,29 @@ void wsrep_dump_rbr_buf_with_header(THD
{
DBUG_ENTER("wsrep_dump_rbr_buf_with_header");
......@@ -228,7 +218,7 @@ index 998f4e7..784b235 100644
DBUG_VOID_RETURN;
}
@@ -498,6 +519,7 @@ void wsrep_dump_rbr_buf_with_header(THD *thd, const void *rbr_buf,
@@ -498,6 +519,7 @@ void wsrep_dump_rbr_buf_with_header(THD
}
cleanup2:
......@@ -236,32 +226,28 @@ index 998f4e7..784b235 100644
end_io_cache(&cache);
cleanup1:
diff --git a/storage/mroonga/vendor/groonga/config.h.cmake b/storage/mroonga/vendor/groonga/config.h.cmake
index 8e3bdaf..bb2aa43 100644
--- a/storage/mroonga/vendor/groonga/config.h.cmake
+++ b/storage/mroonga/vendor/groonga/config.h.cmake
@@ -109,6 +109,7 @@
#cmakedefine HAVE_STRING_H
@@ -107,6 +107,7 @@
#cmakedefine HAVE_SIGNAL_H
#cmakedefine HAVE_SYS_MMAN_H
#cmakedefine HAVE_SYS_PARAM_H
+#cmakedefine HAVE_SYS_POLL_H
#cmakedefine HAVE_SYS_RESOURCE_H
#cmakedefine HAVE_SYS_SELECT_H
#cmakedefine HAVE_SYS_SOCKET_H
diff --git a/storage/mroonga/vendor/groonga/lib/com.c b/storage/mroonga/vendor/groonga/lib/com.c
index a16a446..c796599 100644
--- a/storage/mroonga/vendor/groonga/lib/com.c
+++ b/storage/mroonga/vendor/groonga/lib/com.c
@@ -277,7 +277,7 @@ grn_com_event_init(grn_ctx *ctx, grn_com_event *ev, int max_nevents, int data_si
MUTEX_INIT(ev->mutex);
COND_INIT(ev->cond);
GRN_COM_QUEUE_INIT(&ev->recv_old);
@@ -281,7 +281,7 @@ grn_com_event_init(grn_ctx *ctx, grn_com
memset(&(ev->curr_edge_id), 0, sizeof(grn_com_addr));
ev->acceptor = NULL;
ev->opaque = NULL;
-#ifndef USE_SELECT
+#if !defined(USE_SELECT) && !defined(USE_POLL)
# ifdef USE_EPOLL
if ((ev->events = GRN_MALLOC(sizeof(struct epoll_event) * max_nevents))) {
if ((ev->epfd = epoll_create(max_nevents)) != -1) {
@@ -306,9 +306,9 @@ grn_com_event_init(grn_ctx *ctx, grn_com_event *ev, int max_nevents, int data_si
@@ -310,9 +310,9 @@ grn_com_event_init(grn_ctx *ctx, grn_com
grn_hash_close(ctx, ev->hash);
ev->hash = NULL;
ev->events = NULL;
......@@ -273,7 +259,7 @@ index a16a446..c796599 100644
}
exit :
return ctx->rc;
@@ -322,7 +322,7 @@ grn_com_event_fin(grn_ctx *ctx, grn_com_event *ev)
@@ -326,7 +326,7 @@ grn_com_event_fin(grn_ctx *ctx, grn_com_
grn_msg_close(ctx, msg);
}
if (ev->hash) { grn_hash_close(ctx, ev->hash); }
......@@ -282,7 +268,7 @@ index a16a446..c796599 100644
if (ev->events) { GRN_FREE(ev->events); }
# ifdef USE_EPOLL
grn_close(ev->epfd);
@@ -330,7 +330,7 @@ grn_com_event_fin(grn_ctx *ctx, grn_com_event *ev)
@@ -334,7 +334,7 @@ grn_com_event_fin(grn_ctx *ctx, grn_com_
# ifdef USE_KQUEUE
grn_close(ev->kqfd);
# endif /* USE_KQUEUE*/
......@@ -291,11 +277,9 @@ index a16a446..c796599 100644
return GRN_SUCCESS;
}
diff --git a/storage/mroonga/vendor/groonga/lib/grn_com.h b/storage/mroonga/vendor/groonga/lib/grn_com.h
index e5ad589..63d50e7 100644
--- a/storage/mroonga/vendor/groonga/lib/grn_com.h
+++ b/storage/mroonga/vendor/groonga/lib/grn_com.h
@@ -66,13 +66,22 @@ GRN_API grn_com_queue_entry *grn_com_queue_deque(grn_ctx *ctx, grn_com_queue *q)
@@ -66,13 +66,22 @@ GRN_API grn_com_queue_entry *grn_com_que
/******* grn_com ********/
......@@ -319,16 +303,12 @@ index e5ad589..63d50e7 100644
# ifdef USE_EPOLL
# include <sys/epoll.h>
# define GRN_COM_POLLIN EPOLLIN
@@ -82,16 +91,9 @@ GRN_API grn_com_queue_entry *grn_com_queue_deque(grn_ctx *ctx, grn_com_queue *q)
@@ -82,12 +91,9 @@ GRN_API grn_com_queue_entry *grn_com_que
# include <sys/event.h>
# define GRN_COM_POLLIN EVFILT_READ
# define GRN_COM_POLLOUT EVFILT_WRITE
-# else /* USE_KQUEUE */
-# if defined(HAVE_POLL_H)
-# include <poll.h>
-# elif defined(HAVE_SYS_POLL_H)
-# include <sys/poll.h>
-# endif /* defined(HAVE_POLL_H) */
-# define GRN_COM_POLLIN POLLIN
-# define GRN_COM_POLLOUT POLLOUT
# endif /* USE_KQUEUE */
......@@ -337,7 +317,7 @@ index e5ad589..63d50e7 100644
#endif /* USE_SELECT */
typedef struct _grn_com grn_com;
@@ -137,7 +139,7 @@ struct _grn_com_event {
@@ -133,7 +139,7 @@ struct _grn_com_event {
grn_com_addr curr_edge_id;
grn_com *acceptor;
void *opaque;
......@@ -346,7 +326,7 @@ index e5ad589..63d50e7 100644
#ifdef USE_EPOLL
int epfd;
struct epoll_event *events;
@@ -150,7 +152,7 @@ struct _grn_com_event {
@@ -146,7 +152,7 @@ struct _grn_com_event {
struct pollfd *events;
#endif /* USE_KQUEUE */
#endif /* USE_EPOLL */
......
debian/patches/libmariadbclient-rename.patch
View file @ 8895c70e
......@@ -13,8 +13,6 @@ Subject: libmariadbclient-rename
unittest/mysys/CMakeLists.txt | 2 +-
8 files changed, 46 insertions(+), 41 deletions(-)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index e4643ad..523912e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -32,7 +32,7 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
......@@ -85,8 +83,6 @@ index e4643ad..523912e 100644
SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
PROPERTIES HAS_CXX TRUE)
diff --git a/cmake/for_clients.cmake b/cmake/for_clients.cmake
index dd79ea1..879da78 100644
--- a/cmake/for_clients.cmake
+++ b/cmake/for_clients.cmake
@@ -2,8 +2,8 @@
......@@ -113,8 +109,6 @@ index dd79ea1..879da78 100644
SET(EMB_LIBS "-lmysqld ${ZLIB_DEPS} ${EMB_LIBS} ${openssl_libs}")
MACRO(REPLACE_FOR_CLIENTS VAR)
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index acbd80b..5819d79 100644
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
@@ -398,6 +398,10 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
......@@ -201,8 +195,6 @@ index acbd80b..5819d79 100644
"${CMAKE_SHARED_LIBRARY_SUFFIX}"
"${ver}"
linkname)
diff --git a/man/mysql_config.1 b/man/mysql_config.1
index 47e8a3a..c699974 100644
--- a/man/mysql_config.1
+++ b/man/mysql_config.1
@@ -38,7 +38,7 @@ supports the following options\&.
......@@ -214,7 +206,7 @@ index 47e8a3a..c699974 100644
library\&. The options returned are tied to the specific compiler that was used when the library was created and might clash with the settings for your own compiler\&. Use
\fB\-\-include\fR
for more portable options that contain only include paths\&.
@@ -196,9 +196,9 @@ Usage: /usr/local/mysql/bin/mysql_config [options]
@@ -196,9 +196,9 @@ Usage: /usr/local/mysql/bin/mysql_config
Options:
\-\-cflags [\-I/usr/local/mysql/include/mysql \-mcpu=pentiumpro]
\-\-include [\-I/usr/local/mysql/include/mysql]
......@@ -226,8 +218,6 @@ index 47e8a3a..c699974 100644
\-lpthread \-lz \-lcrypt \-lnsl \-lm \-lpthread]
\-\-socket [/tmp/mysql\&.sock]
\-\-port [3306]
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist
index 2415d40..bfff308 100755
--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
@@ -293,7 +293,7 @@ mkdir -p $DESTDIR/lib/plugin
......@@ -239,7 +229,7 @@ index 2415d40..bfff308 100755
mysys/$TARGET/mysys.lib \
regex/$TARGET/regex.lib \
strings/$TARGET/strings.lib \
@@ -302,7 +302,7 @@ cp storage/*/$TARGET/ha_*.dll $DESTDIR/lib/plugin/
@@ -302,7 +302,7 @@ cp storage/*/$TARGET/ha_*.dll $DESTDIR/l
if [ x"$TARGET" != x"release" ] ; then
cp libmysql/$TARGET/libmysql.pdb \
......@@ -248,7 +238,7 @@ index 2415d40..bfff308 100755
mysys/$TARGET/mysys.pdb \
regex/$TARGET/regex.pdb \
strings/$TARGET/strings.pdb \
@@ -318,8 +318,8 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
@@ -318,8 +318,8 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysq
cp libmysql/debug/libmysql.dll \
libmysql/debug/libmysql.lib \
libmysql/debug/libmysql.pdb \
......@@ -259,8 +249,6 @@ index 2415d40..bfff308 100755
mysys/debug/mysys.lib \
mysys/debug/mysys.pdb \
regex/debug/regex.lib \
diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in
index f2c27bc..9cf718b 100644
--- a/scripts/mysql_config.pl.in
+++ b/scripts/mysql_config.pl.in
@@ -183,15 +183,15 @@ if ( $^O eq "MSWin32" )
......@@ -282,8 +270,6 @@ index f2c27bc..9cf718b 100644
@lib_e_opts = ($linkpath,"-lmysqld");
}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f32e027..cb7e31c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -18,12 +18,12 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT")
......@@ -310,11 +296,9 @@ index f32e027..cb7e31c 100644
SET_TARGET_PROPERTIES(async_queries PROPERTIES LINKER_LANGUAGE CXX)
ENDIF()
diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt
index ad5195a..965df3c 100644
--- a/unittest/mysys/CMakeLists.txt
+++ b/unittest/mysys/CMakeLists.txt
@@ -21,7 +21,7 @@ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
@@ -21,7 +21,7 @@ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES
ADD_DEFINITIONS(${SSL_DEFINES})
MY_ADD_TESTS(ma_dyncol
......
debian/patches/mips-connect-unaligned.patch
View file @ 8895c70e
......@@ -7,11 +7,9 @@ Subject: mips-connect-unaligned
storage/connect/valblk.h | 51 +++++++++++++++++++++++++++++-----------------
2 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/storage/connect/valblk.cpp b/storage/connect/valblk.cpp
index 018c7ee..d32f804 100644
--- a/storage/connect/valblk.cpp
+++ b/storage/connect/valblk.cpp
@@ -266,14 +266,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool check)
@@ -266,14 +266,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
template <class TYPE>
char *TYPBLK<TYPE>::GetCharString(char *p, int n)
{
......@@ -28,7 +26,7 @@ index 018c7ee..d32f804 100644
return p;
} // end of GetCharString
@@ -289,7 +289,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, int n)
@@ -289,7 +289,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
ChkTyp(valp);
if (!(b = valp->IsNull()))
......@@ -37,7 +35,7 @@ index 018c7ee..d32f804 100644
else
Reset(n);
@@ -351,9 +351,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int n)
@@ -351,9 +351,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus);
if (minus && val < maxval)
......@@ -49,7 +47,7 @@ index 018c7ee..d32f804 100644
SetNull(n, false);
} // end of SetValue
@@ -396,7 +396,7 @@ void TYPBLK<double>::SetValue(PCSZ p, int n)
@@ -396,7 +396,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
throw Type;
} // endif Check
......@@ -58,7 +56,7 @@ index 018c7ee..d32f804 100644
SetNull(n, false);
} // end of SetValue
@@ -428,7 +428,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, int n1, int n2)
@@ -428,7 +428,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
ChkTyp(pv);
if (!(b = pv->IsNull(n2) && Nullable))
......@@ -67,7 +65,7 @@ index 018c7ee..d32f804 100644
else
Reset(n1);
@@ -479,10 +479,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int n)
@@ -479,10 +479,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
{
CheckParms(valp, n)
TYPE tval = GetTypedValue(valp);
......@@ -80,7 +78,7 @@ index 018c7ee..d32f804 100644
} // end of SetMin
@@ -494,10 +494,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int n)
@@ -494,10 +494,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
{
CheckParms(valp, n)
TYPE tval = GetTypedValue(valp);
......@@ -93,7 +91,7 @@ index 018c7ee..d32f804 100644
} // end of SetMax
@@ -511,8 +511,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, int k, int n)
@@ -511,8 +511,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
CheckType(pv)
TYPE *lp = ((TYPBLK*)pv)->Typp;
......@@ -103,7 +101,7 @@ index 018c7ee..d32f804 100644
} // end of SetValues
#endif // 0
@@ -523,7 +522,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, int k, int n)
@@ -523,7 +522,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
template <class TYPE>
void TYPBLK<TYPE>::Move(int i, int j)
{
......@@ -112,7 +110,7 @@ index 018c7ee..d32f804 100644
MoveNull(i, j);
} // end of Move
@@ -537,7 +536,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n)
@@ -537,7 +536,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
ChkIndx(n);
ChkTyp(vp);
#endif // _DEBUG
......@@ -121,7 +119,7 @@ index 018c7ee..d32f804 100644
TYPE vlv = GetTypedValue(vp);
return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
@@ -549,8 +548,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n)
@@ -549,8 +548,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
template <class TYPE>
int TYPBLK<TYPE>::CompVal(int i1, int i2)
{
......@@ -150,7 +148,7 @@ index 018c7ee..d32f804 100644
n = MY_MAX(n, m);
} // endfor i
@@ -1333,7 +1332,7 @@ char *DATBLK::GetCharString(char *p, int n)
@@ -1333,7 +1332,7 @@ char *DATBLK::GetCharString(char *p, int
char *vp;
if (Dvalp) {
......@@ -168,8 +166,6 @@ index 018c7ee..d32f804 100644
} else
TYPBLK<int>::SetValue(p, n);
diff --git a/storage/connect/valblk.h b/storage/connect/valblk.h
index a3d7bf3..521dd7f 100644
--- a/storage/connect/valblk.h
+++ b/storage/connect/valblk.h
@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
......
debian/patches/mips-groonga-atomic.patch
View file @ 8895c70e
......@@ -7,11 +7,9 @@ Subject: mips-groonga-atomic
storage/mroonga/vendor/groonga/lib/CMakeLists.txt | 1 +
2 files changed, 3 insertions(+)
diff --git a/storage/mroonga/vendor/groonga/CMakeLists.txt b/storage/mroonga/vendor/groonga/CMakeLists.txt
index 2d8a59f..c1805a3 100644
--- a/storage/mroonga/vendor/groonga/CMakeLists.txt
+++ b/storage/mroonga/vendor/groonga/CMakeLists.txt
@@ -234,6 +234,8 @@ endmacro()
@@ -238,6 +238,8 @@ endmacro()
include(build/ac_macros/check_headers.m4)
include(build/ac_macros/check_functions.m4)
......@@ -20,11 +18,9 @@ index 2d8a59f..c1805a3 100644
ac_check_symbols(fpclassify math.h)
ac_check_lib(m fpclassify)
diff --git a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
index 7825878..975bdd5 100644
--- a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
+++ b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
@@ -62,6 +62,7 @@ endif()
@@ -90,6 +90,7 @@ endif()
set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga")
set(GRN_ALL_LIBRARIES
......
debian/patches/mytop-merge_src:mytop_improvements.patch
View file @ 8895c70e
......@@ -6,11 +6,9 @@ Subject: mytop-merge_src:mytop_improvements
scripts/mytop.sh | 184 +++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 132 insertions(+), 52 deletions(-)
diff --git a/scripts/mytop.sh b/scripts/mytop.sh
index 17a87e9..e8cc902 100644
--- a/scripts/mytop.sh
+++ b/scripts/mytop.sh
@@ -15,6 +15,7 @@ mytop - display MariaDB server performance info like `top'
@@ -15,6 +15,7 @@ mytop - display MariaDB server performan
use 5.005;
use strict;
use DBI;
......@@ -36,7 +34,7 @@ index 17a87e9..e8cc902 100644
port => 3306,
resolve => 0,
slow => 10, # slow query time
@@ -125,6 +128,37 @@ if (!defined($my_print_defaults=my_which("my_print_defaults")))
@@ -125,6 +128,37 @@ if (!defined($my_print_defaults=my_which
unshift @ARGV, split "\n", `$my_print_defaults client mytop`;
......@@ -261,7 +259,7 @@ index 17a87e9..e8cc902 100644
open P, "|$config{pager}" or die "$!";
print keys %{$data[0]};
@@ -1722,7 +1770,7 @@ Help for mytop version $main::VERSION by Jeremy D. Zawodny <${YELLOW}Jeremy\@Zaw
@@ -1722,7 +1770,7 @@ Help for mytop version $main::VERSION by
e - explain the query that a thread is running
E - display current replication error
f - show full query info for a given thread
......@@ -270,7 +268,7 @@ index 17a87e9..e8cc902 100644
h - show only a specifc host's connections
H - toggle the mytop header
i - toggle the display of idle (sleeping) threads
@@ -1737,7 +1785,7 @@ Help for mytop version $main::VERSION by Jeremy D. Zawodny <${YELLOW}Jeremy\@Zaw
@@ -1737,7 +1785,7 @@ Help for mytop version $main::VERSION by
r - reset the status counters (via FLUSH STATUS on your server)
R - change reverse IP lookup
s - change the delay between screen updates
......@@ -279,7 +277,7 @@ index 17a87e9..e8cc902 100644
t - switch to thread view (default)
u - show only a specific user
V - show variables
@@ -1745,7 +1793,7 @@ Help for mytop version $main::VERSION by Jeremy D. Zawodny <${YELLOW}Jeremy\@Zaw
@@ -1745,7 +1793,7 @@ Help for mytop version $main::VERSION by
! - Skip an error that has stopped replications (at your own risk)
L - show full queries (do not strip to terminal width)
......@@ -307,7 +305,7 @@ index 17a87e9..e8cc902 100644
This version comes as part of the B<MariaDB> distribution. See B<http://mariadb.org/>.
@@ -1875,6 +1926,7 @@ In order for B<mytop> to function properly, you must have the
@@ -1875,6 +1926,7 @@ In order for B<mytop> to function proper
following:
* Perl 5.005 or newer
......@@ -315,7 +313,7 @@ index 17a87e9..e8cc902 100644
* Getopt::Long
* DBI and DBD::mysql
* Term::ReadKey from CPAN
@@ -2016,46 +2068,49 @@ have two dashes `--'. Short arguments only have one '-'.
@@ -2016,46 +2068,49 @@ have two dashes `--'. Short arguments on
=over
......@@ -437,7 +435,7 @@ index 17a87e9..e8cc902 100644
=head2 Shortcut Keys
The following keys perform various actions while B<mytop> is
@@ -2204,8 +2287,8 @@ running queries appear at the top of the list.
@@ -2204,8 +2287,8 @@ running queries appear at the top of the
=item B<I>
......@@ -459,7 +457,7 @@ index 17a87e9..e8cc902 100644
=head1 BUGS
@@ -2292,9 +2375,6 @@ width. If you have fairly long database/user/host names the display
@@ -2292,9 +2375,6 @@ width. If you have fairly long database/
may appear odd. I have no good idea as to how best to deal with that
yet. Suggestions are welcome.
......
debian/patches/scripts__mysql_install_db.sh__no_test.patch
View file @ 8895c70e
......@@ -11,11 +11,9 @@ Subject: scripts__mysql_install_db.sh__no_test
scripts/mysql_install_db.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 364cc4f..d78c559 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -406,7 +406,7 @@ then
@@ -408,7 +408,7 @@ then
fi
# Create database directories
......
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