summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-04-05 13:56:05 +0300
committermonty@mysql.com <>2004-04-05 13:56:05 +0300
commit42cf92ce37c7ce9b7356d04273a858a9e42823b5 (patch)
tree0bfd237ce668df7f8a361ddbc36762c5a16b2bae /sql-common
parent99f712a30bc6fcdb5a71cf349243295458d22074 (diff)
downloadmariadb-git-42cf92ce37c7ce9b7356d04273a858a9e42823b5.tar.gz
Fixed many compiler warnings
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319) Fixed crash when doing rollback in slave and the io thread catched up with the sql thread Set locked_in_memory properly
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index b94f3e1de38..4a4de33269b 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2044,7 +2044,7 @@ error:
/* Free alloced memory */
end_server(mysql);
mysql_close_free(mysql);
- if (!(client_flag & CLIENT_REMEMBER_OPTIONS))
+ if (!(((ulong) client_flag) & CLIENT_REMEMBER_OPTIONS))
mysql_close_free_options(mysql);
}
DBUG_RETURN(0);