← Back to branch summary

~ubuntu-branches/ubuntu/wily/mysql-5.6/wily

« back to all changes in this revision

Viewing changes to sql/sql_binlog.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-07-21 07:09:29 UTC
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20150721070929-mg4dpqkgg3it1ajf
Tags: upstream-5.6.25
Import upstream version 5.6.25

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_binlog.cc
1
1
/*
2
 
   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 
2
   Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
3
3
 
4
4
   This program is free software; you can redistribute it and/or modify
5
5
   it under the terms of the GNU General Public License as published by
188
188
       strptr < thd->lex->comment.str + thd->lex->comment.length ; )
189
189
  {
190
190
    char const *endptr= 0;
191
 
    int bytes_decoded= base64_decode(strptr, coded_len, buf, &endptr,
 
191
    int64 bytes_decoded= base64_decode(strptr, coded_len, buf, &endptr,
192
192
                                     MY_BASE64_DECODE_ALLOW_MULTIPLE_CHUNKS);
193
193
 
194
194
#ifndef HAVE_purify
197
197
        since it will read from unassigned memory.
198
198
      */
199
199
    DBUG_PRINT("info",
200
 
               ("bytes_decoded: %d  strptr: 0x%lx  endptr: 0x%lx ('%c':%d)",
 
200
               ("bytes_decoded: %lld  strptr: 0x%lx  endptr: 0x%lx ('%c':%d)",
201
201
                bytes_decoded, (long) strptr, (long) endptr, *endptr,
202
202
                *endptr));
203
203
#endif
226
226
      order to be able to read exactly what is necessary.
227
227
    */
228
228
 
229
 
    DBUG_PRINT("info",("binlog base64 decoded_len: %lu  bytes_decoded: %d",
 
229
    DBUG_PRINT("info",("binlog base64 decoded_len: %lu  bytes_decoded: %lld",
230
230
                       (ulong) decoded_len, bytes_decoded));
231
231
 
232
232
    /*
246
246
        my_error(ER_SYNTAX_ERROR, MYF(0));
247
247
        goto end;
248
248
      }
249
 
      DBUG_PRINT("info", ("event_len=%lu, bytes_decoded=%d",
 
249
      DBUG_PRINT("info", ("event_len=%lu, bytes_decoded=%lld",
250
250
                          event_len, bytes_decoded));
251
251
 
252
252
      if (check_event_type(bufptr[EVENT_TYPE_OFFSET], rli))