summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-11-28 22:35:59 +0100
committerSergei Golubchik <sergii@pisem.net>2013-11-28 22:35:59 +0100
commitab3604989c826aeda3fed147db64756a66361fb3 (patch)
tree7b0e06b600e210e9597267747a9552e2d7304189 /strings
parent38c91c067ba36e1bdc11ded707db9b9f0c84b871 (diff)
downloadmariadb-git-ab3604989c826aeda3fed147db64756a66361fb3.tar.gz
MDEV-4243 [PATCH] Warnings/errors while compiling with clang
fix the code to compile with clang. fix warnings too. include/probes_mysql_nodtrace.h: clang++ doesn't like numeric _constants_ being used in || (it suspects that the intention was | ). Boolean constants are ok. sql/hostname.cc: only used in DBUG_ASSERT sql/item.cc: str_to_time and str_to_datetime return bool, not MYSQL_TIMESTAMP_xxx sql/item_func.cc: str_to_datetime_with_warn() returns bool, not MYSQL_TIMESTAMP_xxx storage/cassandra/CMakeLists.txt: CMAKE_CXX_FLAGS can be empty storage/connect/odbconn.cpp: HWND is void* storage/connect/user_connect.h: deprecated on FreeBSD and unused anyway storage/connect/value.cpp: bad characters inside. unused. storage/spider/spd_trx.cc: clang++ warns that memset will also overwrite vtbl. it might be as well a good idea, as it asserts that the object will only be used as a storage. silence the warning.
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-uca.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 52bc883488a..488432a6d5b 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -18010,7 +18010,7 @@ const uchar uca520_length[4352]={
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
};
-static const uint16 const *uca520_weight[4352]={
+static const uint16 *uca520_weight[4352]={
uca520_p000,uca520_p001,uca520_p002,uca520_p003,
uca520_p004,uca520_p005,uca520_p006,uca520_p007,
uca520_p008,uca520_p009,uca520_p00A,uca520_p00B,