diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-14 10:04:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-14 10:04:07 +0200 |
| commit | f57ecb7786177e0af3b1e3ec94302720b2e0f967 (patch) | |
| tree | fcbed357c5bcdb373830413086d4f58ff9ba2998 /libmysqld | |
| parent | 9bfbe7fbce86eab5a8a5de7e401772f058872716 (diff) | |
| parent | d364e64ae28c5588ea0ad013738a8dfe18412292 (diff) | |
| download | mariadb-git-f57ecb7786177e0af3b1e3ec94302720b2e0f967.tar.gz | |
5.5 merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 5332003885d..5e798674c2d 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= |