Change replication to use uchar for all buffers instead of char

This change is to get rid of randomly failing tests, especially those
that reads random position of the binary log. From looking at the logs
it's clear that some failures is because of a read char (with value >= 128)
is converted to a big long value. Using uchar everywhere makes this much
less likely to happen.
Another benefit is that a lot of cast of char to uchar could be removed.

Other things:
- Removed some extra space before '=' and '+=' in assignments
- Fixed indentations and lines > 80 characters
- Replace '16' with 'element_size' (from class definition) in
  Gtid_list_log_event()

1 files changed, 25 insertions, 21 deletions

diff --git a/sql/log_event_client.cc b/sql/log_event_client.cc
index 3db66e4201f..6b5d71348e1 100644
--- a/sql/log_event_client.cc
+++ b/sql/log_event_client.cc
@@ -1587,7 +1587,7 @@ bool Log_event::print_base64(IO_CACHE* file,
                              PRINT_EVENT_INFO* print_event_info,
                              bool do_print_encoded)
 {
-  uchar *ptr= (uchar *)temp_buf;
+  uchar *ptr= temp_buf;
   uint32 size= uint4korr(ptr + EVENT_LEN_OFFSET);
   DBUG_ENTER("Log_event::print_base64");
 
@@ -1602,31 +1602,31 @@ bool Log_event::print_base64(IO_CACHE* file,
     switch (ev_type) {
       case WRITE_ROWS_EVENT:
         ptr[EVENT_TYPE_OFFSET]= DELETE_ROWS_EVENT;
-        ev= new Delete_rows_log_event((const char*) ptr, tmp_size,
+        ev= new Delete_rows_log_event(ptr, tmp_size,
                                        glob_description_event);
         ev->change_to_flashback_event(print_event_info, ptr, ev_type);
         break;
       case WRITE_ROWS_EVENT_V1:
         ptr[EVENT_TYPE_OFFSET]= DELETE_ROWS_EVENT_V1;
-        ev= new Delete_rows_log_event((const char*) ptr, tmp_size,
+        ev= new Delete_rows_log_event(ptr, tmp_size,
                                        glob_description_event);
         ev->change_to_flashback_event(print_event_info, ptr, ev_type);
         break;
       case DELETE_ROWS_EVENT:
         ptr[EVENT_TYPE_OFFSET]= WRITE_ROWS_EVENT;
-        ev= new Write_rows_log_event((const char*) ptr, tmp_size,
+        ev= new Write_rows_log_event(ptr, tmp_size,
                                        glob_description_event);
         ev->change_to_flashback_event(print_event_info, ptr, ev_type);
         break;
       case DELETE_ROWS_EVENT_V1:
         ptr[EVENT_TYPE_OFFSET]= WRITE_ROWS_EVENT_V1;
-        ev= new Write_rows_log_event((const char*) ptr, tmp_size,
+        ev= new Write_rows_log_event(ptr, tmp_size,
                                        glob_description_event);
         ev->change_to_flashback_event(print_event_info, ptr, ev_type);
         break;
       case UPDATE_ROWS_EVENT:
       case UPDATE_ROWS_EVENT_V1:
-        ev= new Update_rows_log_event((const char*) ptr, tmp_size,
+        ev= new Update_rows_log_event(ptr, tmp_size,
                                        glob_description_event);
         ev->change_to_flashback_event(print_event_info, ptr, ev_type);
         break;
@@ -1673,7 +1673,7 @@ bool Log_event::print_base64(IO_CACHE* file,
     case TABLE_MAP_EVENT:
     {
       Table_map_log_event *map; 
-      map= new Table_map_log_event((const char*) ptr, size, 
+      map= new Table_map_log_event(ptr, size, 
                                    glob_description_event);
 #ifdef WHEN_FLASHBACK_REVIEW_READY
       if (need_flashback_review)
@@ -1688,42 +1688,42 @@ bool Log_event::print_base64(IO_CACHE* file,
     case WRITE_ROWS_EVENT:
     case WRITE_ROWS_EVENT_V1:
     {
-      ev= new Write_rows_log_event((const char*) ptr, size,
+      ev= new Write_rows_log_event(ptr, size,
                                    glob_description_event);
       break;
     }
     case DELETE_ROWS_EVENT:
     case DELETE_ROWS_EVENT_V1:
     {
-      ev= new Delete_rows_log_event((const char*) ptr, size,
+      ev= new Delete_rows_log_event(ptr, size,
                                     glob_description_event);
       break;
     }
     case UPDATE_ROWS_EVENT:
     case UPDATE_ROWS_EVENT_V1:
     {
-      ev= new Update_rows_log_event((const char*) ptr, size,
+      ev= new Update_rows_log_event(ptr, size,
                                     glob_description_event);
       break;
     }
     case WRITE_ROWS_COMPRESSED_EVENT:
     case WRITE_ROWS_COMPRESSED_EVENT_V1:
     {
-      ev= new Write_rows_compressed_log_event((const char*) ptr, size,
+      ev= new Write_rows_compressed_log_event(ptr, size,
                                               glob_description_event);
       break;
     }
     case UPDATE_ROWS_COMPRESSED_EVENT:
     case UPDATE_ROWS_COMPRESSED_EVENT_V1:
     {
-      ev= new Update_rows_compressed_log_event((const char*) ptr, size,
+      ev= new Update_rows_compressed_log_event(ptr, size,
                                                glob_description_event);
       break;
       }
     case DELETE_ROWS_COMPRESSED_EVENT:
     case DELETE_ROWS_COMPRESSED_EVENT_V1:
     {
-      ev= new Delete_rows_compressed_log_event((const char*) ptr, size,
+      ev= new Delete_rows_compressed_log_event(ptr, size,
                                                glob_description_event);
       break;
     }
@@ -3103,7 +3103,8 @@ int Table_map_log_event::rewrite_db(const char* new_db, size_t new_len,
   // Create new temp_buf
   ulong event_cur_len= uint4korr(temp_buf + EVENT_LEN_OFFSET);
   ulong event_new_len= event_cur_len + len_diff;
-  char* new_temp_buf= (char*) my_malloc(PSI_NOT_INSTRUMENTED, event_new_len, MYF(MY_WME));
+  uchar* new_temp_buf= (uchar*) my_malloc(PSI_NOT_INSTRUMENTED, event_new_len,
+                                          MYF(MY_WME));
 
   if (!new_temp_buf)
   {
@@ -3114,7 +3115,7 @@ int Table_map_log_event::rewrite_db(const char* new_db, size_t new_len,
   }
 
   // Rewrite temp_buf
-  char* ptr= new_temp_buf;
+  uchar *ptr= new_temp_buf;
   size_t cnt= 0;
 
   // Copy header and change event length
@@ -3612,12 +3613,13 @@ bool Write_rows_log_event::print(FILE *file, PRINT_EVENT_INFO* print_event_info)
 bool Write_rows_compressed_log_event::print(FILE *file,
                                             PRINT_EVENT_INFO* print_event_info)
 {
-  char *new_buf;
+  uchar *new_buf;
   ulong len;
   bool is_malloc = false;
   if(!row_log_event_uncompress(glob_description_event,
                                checksum_alg == BINLOG_CHECKSUM_ALG_CRC32,
-                               temp_buf, UINT_MAX32, NULL, 0, &is_malloc, &new_buf, &len))
+                               temp_buf, UINT_MAX32, NULL, 0, &is_malloc,
+                               &new_buf, &len))
   {
     free_temp_buf();
     register_temp_buf(new_buf, true);
@@ -3648,12 +3650,13 @@ bool Delete_rows_log_event::print(FILE *file,
 bool Delete_rows_compressed_log_event::print(FILE *file,
                                              PRINT_EVENT_INFO* print_event_info)
 {
-  char *new_buf;
+  uchar *new_buf;
   ulong len;
   bool is_malloc = false;
   if(!row_log_event_uncompress(glob_description_event,
                                checksum_alg == BINLOG_CHECKSUM_ALG_CRC32,
-                               temp_buf, UINT_MAX32, NULL, 0, &is_malloc, &new_buf, &len))
+                               temp_buf, UINT_MAX32, NULL, 0, &is_malloc,
+                               &new_buf, &len))
   {
     free_temp_buf();
     register_temp_buf(new_buf, true);
@@ -3684,12 +3687,13 @@ bool
 Update_rows_compressed_log_event::print(FILE *file,
                                         PRINT_EVENT_INFO *print_event_info)
 {
-  char *new_buf;
+  uchar *new_buf;
   ulong len;
   bool is_malloc= false;
   if(!row_log_event_uncompress(glob_description_event,
                                checksum_alg == BINLOG_CHECKSUM_ALG_CRC32,
-                               temp_buf, UINT_MAX32, NULL, 0, &is_malloc, &new_buf, &len))
+                               temp_buf, UINT_MAX32, NULL, 0, &is_malloc,
+                               &new_buf, &len))
   {
     free_temp_buf();
     register_temp_buf(new_buf, true);