summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-03-28 20:04:14 +0100
committerSergei Golubchik <sergii@pisem.net>2013-03-28 20:04:14 +0100
commit2901497b187ffcefbec73c4ac9b5270174e8682c (patch)
tree7546fe994305164a171948be01d7a261427b47d6 /libmysqld
parent78683672707bad90169b68b4c5d8aadc0e895f3d (diff)
downloadmariadb-git-2901497b187ffcefbec73c4ac9b5270174e8682c.tar.gz
MDEV-4243 Warnings/errors while compiling with clang
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index b454fc0d2e0..298907b2644 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -440,7 +440,7 @@ static MYSQL_RES * emb_store_result(MYSQL *mysql)
int emb_read_change_user_result(MYSQL *mysql)
{
mysql->net.read_pos= (uchar*)""; // fake an OK packet
- return mysql_errno(mysql) ? packet_error : 1 /* length of the OK packet */;
+ return mysql_errno(mysql) ? (int)packet_error : 1 /* length of the OK packet */;
}
MYSQL_METHODS embedded_methods=