database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source
This commit is contained in:
Davi Arnaut
2010-07-02 16:38:04 -03:00
parent 02de8f68a5 93fb8bb235
commit 74283a052e
60 changed files with 260 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/rpl_rli.cc
View File

@@ -1138,8 +1138,7 @@ bool Relay_log_info::cached_charset_compare(char *charset) const
{
DBUG_ENTER("Relay_log_info::cached_charset_compare");
if (bcmp((uchar*) cached_charset, (uchar*) charset,
sizeof(cached_charset)))
if (memcmp(cached_charset, charset, sizeof(cached_charset)))
{
memcpy(const_cast<char*>(cached_charset), charset, sizeof(cached_charset));
DBUG_RETURN(1);