Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4

(Merge tag 'clone-5.6.37-build' into mysql-5.6-cluster-7.3)

Author: arnabray21

CMakeLists.txt

@@ -314,6 +314,36 @@ IF (ENABLE_GPROF AND NOT WIN32 AND NOT APPLE)
  "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -pg")
 ENDIF()
 
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ OPTION(REPRODUCIBLE_BUILD "Take extra pains to make build result independent of build location and time" OFF)
+ENDIF()
+IF(REPRODUCIBLE_BUILD)
+ SET(DEBUG_PREFIX_FLAGS
+ "-fdebug-prefix-map=${CMAKE_SOURCE_DIR}/=./ -fdebug-prefix-map=${CMAKE_CURRENT_BINARY_DIR}=./obj")
+
+ # See if -fdebug-prefix= commands are included in the debug output,
+ # making the build unreproducible with switches recorded.
+ # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69821.
+ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -g3 -x c -S -fdebug-prefix-map=foo=bar -o - -
+ INPUT_FILE /dev/null OUTPUT_VARIABLE DEBUG_PREFIX_MAP_RESULT)
+ IF(DEBUG_PREFIX_MAP_RESULT MATCHES "foo=bar")
+ SET(DEBUG_PREFIX_FLAGS "${DEBUG_PREFIX_FLAGS} -gno-record-gcc-switches")
+ ENDIF()
+
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${DEBUG_PREFIX_FLAGS}")
+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO
+ "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${DEBUG_PREFIX_FLAGS}")
+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEBUG_PREFIX_FLAGS}")
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+ "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${DEBUG_PREFIX_FLAGS}")
+
+ SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--build-id=none")
+ SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--build-id=none")
+
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE
+ "${CMAKE_SOURCE_DIR}/scripts/invoke-with-relative-paths.pl")
+ENDIF()
+
 OPTION(ENABLED_LOCAL_INFILE
  "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN})
 MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE)

VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=36
+MYSQL_VERSION_PATCH=37
 MYSQL_VERSION_EXTRA=-ndb-7.4.16

client/mysql.cc

@@ -151,7 +151,7 @@ static my_bool ignore_errors=0,wait_flag=0,quick=0,
  default_pager_set= 0, opt_sigint_ignore= 0,
  auto_vertical_output= 0,
  show_warnings= 0, executing_query= 0, interrupted_query= 0,
- ignore_spaces= 0;
+ ignore_spaces= 0, opt_binhex= 0;
 static my_bool debug_info_flag, debug_check_flag;
 static my_bool column_types_flag;
 static my_bool preserve_comments= 0;
@@ -1567,6 +1567,8 @@ static struct my_option my_long_options[] =
  {"bind-address", 0, "IP address to bind to.",
  (uchar**) &opt_bind_addr, (uchar**) &opt_bind_addr, 0, GET_STR,
  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+ {"binary-as-hex", 'b', "Print binary data as hex", &opt_binhex, &opt_binhex,
+ 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
  {"character-sets-dir", OPT_CHARSETS_DIR,
  "Directory for character set files.", &charsets_dir,
  &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
@@ -3690,6 +3692,39 @@ print_field_types(MYSQL_RES *result)
  tee_puts("", PAGER);
 }
 
+/* Used to determine if we should invoke print_as_hex for this field */
+
+static bool
+is_binary_field(MYSQL_FIELD *field)
+{
+ if ((field->charsetnr == 63) &&
+ (field->type == MYSQL_TYPE_BIT ||
+ field->type == MYSQL_TYPE_BLOB ||
+ field->type == MYSQL_TYPE_LONG_BLOB ||
+ field->type == MYSQL_TYPE_MEDIUM_BLOB ||
+ field->type == MYSQL_TYPE_TINY_BLOB ||
+ field->type == MYSQL_TYPE_VAR_STRING ||
+ field->type == MYSQL_TYPE_STRING ||
+ field->type == MYSQL_TYPE_VARCHAR ||
+ field->type == MYSQL_TYPE_GEOMETRY))
+ return 1;
+ return 0;
+}
+
+
+/* Print binary value as hex literal (0x ...) */
+
+static void
+print_as_hex(FILE *output_file, const char *str, ulong len, ulong total_bytes_to_send)
+{
+ const char *ptr= str, *end= ptr+len;
+ ulong i;
+ fprintf(output_file, "0x");
+ for(; ptr < end; ptr++)
+ fprintf(output_file, "%02X", *((uchar*)ptr));
+ for (i= 2*len+2; i < total_bytes_to_send; i++)
+ tee_putc((int)' ', output_file);
+}
 
 static void
 print_table_data(MYSQL_RES *result)
@@ -3719,7 +3754,9 @@ print_table_data(MYSQL_RES *result)
  length= max<size_t>(length, field->max_length);
  if (length < 4 && !IS_NOT_NULL(field->flags))
  length=4;// Room for "NULL"
- field->max_length=length;
+ if (opt_binhex && is_binary_field(field))
+ length= 2 + length * 2;
+ field->max_length=(ulong) length;
  separator.fill(separator.length()+length+2,'-');
  separator.append('+');
  }
@@ -3786,9 +3823,11 @@ print_table_data(MYSQL_RES *result)
  many extra padding-characters we should send with the printing function.
  */
  visible_length= charset_info->cset->numcells(charset_info, buffer, buffer + data_length);
- extra_padding= data_length - visible_length;
+ extra_padding= (uint) (data_length - visible_length);
 
- if (field_max_length > MAX_COLUMN_LENGTH)
+ if (opt_binhex && is_binary_field(field))
+ print_as_hex(PAGER, cur[off], lengths[off], field_max_length);
+ else if (field_max_length > MAX_COLUMN_LENGTH)
  tee_print_sized_data(buffer, data_length, MAX_COLUMN_LENGTH+extra_padding, FALSE);
  else
  {
@@ -3914,19 +3953,22 @@ print_table_data_html(MYSQL_RES *result)
  if (interrupted_query)
  break;
  ulong *lengths=mysql_fetch_lengths(result);
+ field= mysql_fetch_fields(result);
  (void) tee_fputs("<TR>", PAGER);
  for (uint i=0; i < mysql_num_fields(result); i++)
  {
  (void) tee_fputs("<TD>", PAGER);
- xmlencode_print(cur[i], lengths[i]);
+ if (opt_binhex && is_binary_field(&field[i]))
+ print_as_hex(PAGER, cur[i], lengths[i], lengths[i]);
+ else
+ xmlencode_print(cur[i], lengths[i]);
  (void) tee_fputs("</TD>", PAGER);
  }
  (void) tee_fputs("</TR>", PAGER);
  }
  (void) tee_fputs("</TABLE>", PAGER);
 }
 
-
 static void
 print_table_data_xml(MYSQL_RES *result)
 {
@@ -3954,7 +3996,10 @@ print_table_data_xml(MYSQL_RES *result)
  if (cur[i])
  {
  tee_fprintf(PAGER, "\">");
- xmlencode_print(cur[i], lengths[i]);
+ if (opt_binhex && is_binary_field(&fields[i]))
+ print_as_hex(PAGER, cur[i], lengths[i], lengths[i]);
+ else
+ xmlencode_print(cur[i], lengths[i]);
  tee_fprintf(PAGER, "</field>\n");
  }
  else
@@ -3999,7 +4044,10 @@ print_table_data_vertically(MYSQL_RES *result)
  tee_fprintf(PAGER, "%*s: ",(int) max_length,field->name);
  if (cur[off])
  {
- tee_write(PAGER, cur[off], lengths[off], MY_PRINT_SPS_0 | MY_PRINT_MB);
+ if (opt_binhex && is_binary_field(field))
+ print_as_hex(PAGER, cur[off], lengths[off], lengths[off]);
+ else
+ tee_write(PAGER, cur[off], lengths[off], MY_PRINT_SPS_0 | MY_PRINT_MB);
  tee_putc('\n', PAGER);
  }
  else
@@ -4108,11 +4156,21 @@ print_tab_data(MYSQL_RES *result)
  while ((cur = mysql_fetch_row(result)))
  {
  lengths=mysql_fetch_lengths(result);
- safe_put_field(cur[0],lengths[0]);
+
+ field= mysql_fetch_fields(result);
+ if (opt_binhex && is_binary_field(&field[0]))
+ print_as_hex(PAGER, cur[0], lengths[0], lengths[0]);
+ else
+ safe_put_field(cur[0],lengths[0]);
+
  for (uint off=1 ; off < mysql_num_fields(result); off++)
  {
  (void) tee_fputs("\t", PAGER);
- safe_put_field(cur[off], lengths[off]);
+
+ if (opt_binhex && field && is_binary_field(&field[off]))
+ print_as_hex(PAGER, cur[off], lengths[off], lengths[off]);
+ else
+ safe_put_field(cur[off], lengths[off]);
  }
  (void) tee_fputs("\n", PAGER);
  }
@@ -4488,10 +4546,9 @@ com_use(String *buffer MY_ATTRIBUTE((unused)), char *line)
  memset(buff, 0, sizeof(buff));
 
  /*
- In case number of quotes exceed 2, we try to get
- the normalized db name.
+ In case of quotes used, try to get the normalized db name.
  */
- if (get_quote_count(line) > 2)
+ if (get_quote_count(line) > 0)
  {
  if (normalize_dbname(line, buff, sizeof(buff)))
  return put_error(&mysql);
@@ -4709,11 +4766,13 @@ char *get_arg(char *line, my_bool get_next_arg)
 static int
 get_quote_count(const char *line)
 {
- int quote_count;
- const char *ptr= line;
+ int quote_count= 0;
+ const char *quote= line;
 
- for(quote_count= 0; ptr ++ && *ptr; ptr= strpbrk(ptr, "\"\'`"))
- quote_count ++;
+ while ((quote= strpbrk(quote, "'`\"")) != NULL) {
+ quote_count++;
+ quote++;
+ }
 
  return quote_count;
 }

client/mysqlbinlog.cc

@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -68,6 +68,21 @@ using std::max;
 
 #define CLIENT_CAPABILITIES(CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES)
 
+/**
+ The function represents Log_event delete wrapper
+ to reset possibly active temp_buf member.
+ It's to be invoked in context where the member is
+ not bound with dynamically allocated memory and therefore can
+ be reset as simple as with plain assignment to NULL.
+
+ @param ev a pointer to Log_event instance
+*/
+inline void reset_temp_buf_and_delete(Log_event *ev)
+{
+ ev->temp_buf= NULL;
+ delete ev;
+}
+
 char server_version[SERVER_VERSION_LENGTH];
 ulong filter_server_id = 0;
 /* 
@@ -2408,6 +2423,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
  if ((rev->ident_len != logname_len) ||
  memcmp(rev->new_log_ident, logname, logname_len))
  {
+ reset_temp_buf_and_delete(rev);
  DBUG_RETURN(OK_CONTINUE);
  }
  /*
@@ -2416,6 +2432,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
  log. If we are running with to_last_remote_log, we print it,
  because it serves as a useful marker between binlogs then.
  */
+ reset_temp_buf_and_delete(rev);
  continue;
  }
  /*
@@ -2446,6 +2463,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
  MYF(MY_WME))))
  {
  error("Could not create log file '%s'", log_file_name);
+ reset_temp_buf_and_delete(ev);
  DBUG_RETURN(ERROR_STOP);
  }
  DBUG_EXECUTE_IF("simulate_result_file_write_error_for_FD_event",
@@ -2454,6 +2472,7 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
  BIN_LOG_HEADER_SIZE, MYF(MY_NABP)))
  {
  error("Could not write into log file '%s'", log_file_name);
+ reset_temp_buf_and_delete(ev);
  DBUG_RETURN(ERROR_STOP);
  }
  /*
@@ -2486,10 +2505,9 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
  retval= ERROR_STOP;
  }
  if (ev)
- {
- ev->temp_buf=0;
- delete ev;
- }
+ reset_temp_buf_and_delete(ev);
+ /* Flush result_file after every event */
+ fflush(result_file);
  }
  else
  {
@@ -2507,7 +2525,10 @@ static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,
  File file;
 
  if ((file= load_processor.prepare_new_file_for_old_format(le,fname)) < 0)
+ {
+ reset_temp_buf_and_delete(ev);
  DBUG_RETURN(ERROR_STOP);
+ }
 
  retval= process_event(print_event_info, ev, old_off, logname);
  if (retval != OK_CONTINUE)

include/byte_order_generic_x86.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -27,17 +27,9 @@
  ((uint32) (uchar) (A)[0])))
 #define sint4korr(A)	(*((long *) (A)))
 #define uint2korr(A)	(*((uint16 *) (A)))
-/*
- Attention: Please, note, uint3korr reads 4 bytes (not 3)!
- It means, that you have to provide enough allocated space.
-*/
-#if defined(HAVE_purify) && !defined(_WIN32)
 #define uint3korr(A)	(uint32) (((uint32) ((uchar) (A)[0])) +\
  (((uint32) ((uchar) (A)[1])) << 8) +\
  (((uint32) ((uchar) (A)[2])) << 16))
-#else
-#define uint3korr(A)	(long) (*((unsigned int *) (A)) & 0xFFFFFF)
-#endif
 #define uint4korr(A)	(*((uint32 *) (A)))
 #define uint5korr(A)	((ulonglong)(((uint32) ((uchar) (A)[0])) +\
  (((uint32) ((uchar) (A)[1])) << 8) +\

include/byte_order_generic_x86_64.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -27,17 +27,9 @@
  ((uint32) (uchar) (A)[0])))
 #define sint4korr(A)	(int32) (*((int32 *) (A)))
 #define uint2korr(A)	(uint16) (*((uint16 *) (A)))
-/*
- Attention: Please, note, uint3korr reads 4 bytes (not 3)!
- It means, that you have to provide enough allocated space.
-*/
-#if defined(HAVE_purify) && !defined(_WIN32)
 #define uint3korr(A)	(uint32) (((uint32) ((uchar) (A)[0])) +\
  (((uint32) ((uchar) (A)[1])) << 8) +\
  (((uint32) ((uchar) (A)[2])) << 16))
-#else
-#define uint3korr(A)	(uint32) (*((unsigned int *) (A)) & 0xFFFFFF)
-#endif
 #define uint4korr(A)	(uint32) (*((uint32 *) (A)))
 #define uint5korr(A)	((ulonglong)(((uint32) ((uchar) (A)[0])) +\
  (((uint32) ((uchar) (A)[1])) << 8) +\