[Commits] Rev 2907: Fix two compiler warnings from Buildbot (including one bad merge). in http://bazaar.launchpad.net/~maria-captains/maria/5.2

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Tue Jan 11 10:06:54 EET 2011


At http://bazaar.launchpad.net/~maria-captains/maria/5.2

------------------------------------------------------------
revno: 2907
revision-id: knielsen at knielsen-hq.org-20110111080654-9yevqumhx6dvmefa
parent: knielsen at knielsen-hq.org-20110110135426-og3r30f6vfw6c3yk
committer: knielsen at knielsen-hq.org
branch nick: work-5.2-percona-mwl47
timestamp: Tue 2011-01-11 09:06:54 +0100
message:
  Fix two compiler warnings from Buildbot (including one bad merge).
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2011-01-10 13:54:26 +0000
+++ b/sql/log_event.cc	2011-01-11 08:06:54 +0000
@@ -8036,7 +8036,8 @@ void Annotate_rows_log_event::print(FILE
     // find end of the next line
     for (pend= pbeg + 1;
          ++cnt <= m_query_len && *pend != '\r' && *pend != '\n';
-         pend++);
+         pend++)
+      ;
 
     // print next line
     my_b_write(&pinfo->head_cache, (const uchar*) "#Q> ", 4);

=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2011-01-10 13:53:09 +0000
+++ b/sql/sql_repl.cc	2011-01-11 08:06:54 +0000
@@ -556,7 +556,6 @@ impossible position";
       }
 #endif
 
-      if ((*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] &



More information about the commits mailing list