summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorEugene Kosov <claprix@yandex.ru>2019-06-24 19:38:00 +0300
committerEugene Kosov <claprix@yandex.ru>2019-06-25 13:21:36 +0300
commitd36c107a6b7f9e9bc9425072f2ac13afd2334069 (patch)
treef2789ec42ae3419e7633aeb08b5a8a27fd703329 /extra
parentd78145459f79d02438e0d57fe8acaff757018c97 (diff)
downloadmariadb-git-d36c107a6b7f9e9bc9425072f2ac13afd2334069.tar.gz
imporve clang build
cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug Maintainer mode makes all warnings errors. This patch fix warnings. Mostly about deprecated `register` keyword. Too much warnings came from Mroonga and I gave up on it.
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/backup_mysql.cc2
-rw-r--r--extra/yassl/include/openssl/crypto.h2
-rw-r--r--extra/yassl/taocrypt/src/des.cpp2
3 files changed, 2 insertions, 4 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc
index f15f0c40556..543fd4102f2 100644
--- a/extra/mariabackup/backup_mysql.cc
+++ b/extra/mariabackup/backup_mysql.cc
@@ -1393,8 +1393,6 @@ write_xtrabackup_info(MYSQL *connection)
const char *xb_stream_name[] = {"file", "tar", "xbstream"};
- ut_ad(xtrabackup_stream_fmt < 3);
-
uuid = read_mysql_one_value(connection, "SELECT UUID()");
server_version = read_mysql_one_value(connection, "SELECT VERSION()");
localtime_r(&history_start_time, &tm);
diff --git a/extra/yassl/include/openssl/crypto.h b/extra/yassl/include/openssl/crypto.h
index d60d5a0e398..f229f8b612c 100644
--- a/extra/yassl/include/openssl/crypto.h
+++ b/extra/yassl/include/openssl/crypto.h
@@ -19,7 +19,7 @@
/* crypto.h for openSSL */
-#ifndef ysSSL_crypto_h__
+#ifndef yaSSL_crypto_h__
#define yaSSL_crypto_h__
#ifdef YASSL_PREFIX
diff --git a/extra/yassl/taocrypt/src/des.cpp b/extra/yassl/taocrypt/src/des.cpp
index 5b6fd9aa05b..f921cfcc977 100644
--- a/extra/yassl/taocrypt/src/des.cpp
+++ b/extra/yassl/taocrypt/src/des.cpp
@@ -224,7 +224,7 @@ void BasicDES::SetKey(const byte* key, word32 /*length*/, CipherDir dir)
byte *const pc1m = buffer; /* place to modify pc1 into */
byte *const pcr = pc1m + 56; /* place to rotate pc1 into */
byte *const ks = pcr + 56;
- register int i,j,l;
+ int i,j,l;
int m;
for (j = 0; j < 56; j++) { /* convert pc1 to bits of key */