database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix two compiler warnings from Buildbot (including one bad merge).

Browse Source
This commit is contained in:
unknown
2011-01-11 09:06:54 +01:00
parent e6d4ba1b05
commit bacb41a6b7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/log_event.cc
View File

@ -8036,7 +8036,8 @@ void Annotate_rows_log_event::print(FILE *file, PRINT_EVENT_INFO *pinfo)
// find end of the next line // find end of the next line
for (pend= pbeg + 1; for (pend= pbeg + 1;
++cnt <= m_query_len && *pend != '\r' && *pend != '\n'; ++cnt <= m_query_len && *pend != '\r' && *pend != '\n';
pend++); pend++)
;
// print next line // print next line
my_b_write(&pinfo->head_cache, (const uchar*) "#Q> ", 4); my_b_write(&pinfo->head_cache, (const uchar*) "#Q> ", 4);

1
sql/sql_repl.cc
View File

@ -556,7 +556,6 @@ impossible position";
} }
#endif #endif
if ((*packet)[EVENT_TYPE_OFFSET+1] == FORMAT_DESCRIPTION_EVENT)
if ((uchar)(*packet)[EVENT_TYPE_OFFSET+1] == FORMAT_DESCRIPTION_EVENT) if ((uchar)(*packet)[EVENT_TYPE_OFFSET+1] == FORMAT_DESCRIPTION_EVENT)
{ {
binlog_can_be_corrupted= test((*packet)[FLAGS_OFFSET+1] & binlog_can_be_corrupted= test((*packet)[FLAGS_OFFSET+1] &