Merge branch '10.1' of https://github.com/MariaDB/server into ok-debpkg-10.1

Author: ottok

.gitattributes

@@ -15,6 +15,7 @@
 *.dat -text -whitespace
 
 storage/connect/mysql-test/connect/std_data/*.txt -text
+pcre/testdata/greppatN4 -text
 
 # Denote all files that are truly binary and should not be modified.
 *.png binary

.gitignore

@@ -277,6 +277,10 @@ storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
 *.vcproj.*
 *.vcproj.*.*
 *.vcproj.*.*.*
+*.vcxproj
+*.vcxproj.*
+*.vcxproj.*.*
+*.vcxproj.*.*.*
 
 # Build results
 [Dd]ebug/

CMakeLists.txt

@@ -401,7 +401,6 @@ IF(WIN32)
  ADD_SUBDIRECTORY(win/upgrade_wizard)
  ADD_SUBDIRECTORY(win/packaging)
 ENDIF()
-ADD_SUBDIRECTORY(packaging/solaris)
 
 
 INCLUDE(for_clients)

client/mysql_upgrade.c

@@ -1109,7 +1109,7 @@ int main(int argc, char **argv)
  printf("This installation of MySQL is already upgraded to %s, "
  "use --force if you still need to run mysql_upgrade\n",
  MYSQL_SERVER_VERSION);
- die(NULL);
+ goto end;
  }
 
  if (opt_version_check && check_version_match())
@@ -1138,6 +1138,7 @@ int main(int argc, char **argv)
 
  DBUG_ASSERT(phase == phases_total);
 
+end:
  free_used_memory();
  my_end(my_end_arg);
  exit(0);

client/mysqlbinlog.cc

@@ -2240,7 +2240,7 @@ static Exit_status check_header(IO_CACHE* file,
  Format_description_log_event *new_description_event;
  my_b_seek(file, tmp_pos); /* seek back to event's start */
  if (!(new_description_event= (Format_description_log_event*) 
- Log_event::read_log_event(file, glob_description_event,
+ Log_event::read_log_event(file, 0, glob_description_event,
  opt_verify_binlog_checksum)))
  /* EOF can't be hit here normally, so it's a real error */
  {
@@ -2274,7 +2274,7 @@ static Exit_status check_header(IO_CACHE* file,
  {
  Log_event *ev;
  my_b_seek(file, tmp_pos); /* seek back to event's start */
- if (!(ev= Log_event::read_log_event(file, glob_description_event,
+ if (!(ev= Log_event::read_log_event(file, 0, glob_description_event,
  opt_verify_binlog_checksum)))
  {
  /* EOF can't be hit here normally, so it's a real error */
@@ -2388,7 +2388,7 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
  char llbuff[21];
  my_off_t old_off = my_b_tell(file);
 
- Log_event* ev = Log_event::read_log_event(file, glob_description_event,
+ Log_event* ev = Log_event::read_log_event(file, 0, glob_description_event,
  opt_verify_binlog_checksum);
  if (!ev)
  {
@@ -2575,6 +2575,11 @@ void *sql_alloc(size_t size)
  return alloc_root(&s_mem_root, size);
 }
 
+struct encryption_service_st encryption_handler=
+{
+ 0, 0, 0, 0, 0, 0, 0
+};
+
 /*
  We must include this here as it's compiled with different options for
  the server

client/mysqlimport.c

@@ -36,7 +36,7 @@
 
 
 /* Global Thread counter */
-uint counter;
+uint counter= 0;
 pthread_mutex_t counter_mutex;
 pthread_cond_t count_threshhold;
 
@@ -489,6 +489,11 @@ static void safe_exit(int error, MYSQL *mysql)
 {
  if (error && ignore_errors)
  return;
+
+ /* in multi-threaded mode protect from concurrent safe_exit's */
+ if (counter)
+ pthread_mutex_lock(&counter_mutex);
+
  if (mysql)
  mysql_close(mysql);
 

client/mysqlslap.c

@@ -1,5 +1,6 @@
 /*
- Copyright (c) 2005, 2012, Oracle and/or its affiliates.
+ Copyright (c) 2005, 2015, Oracle and/or its affiliates.
+ Copyright (c) 2010, 2015, MariaDB
 
  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
@@ -242,7 +243,7 @@ void print_conclusions_csv(conclusions *con);
 void generate_stats(conclusions *con, option_string *eng, stats *sptr);
 uint parse_comma(const char *string, uint **range);
 uint parse_delimiter(const char *script, statement **stmt, char delm);
-uint parse_option(const char *origin, option_string **stmt, char delm);
+int parse_option(const char *origin, option_string **stmt, char delm);
 static int drop_schema(MYSQL *mysql, const char *db);
 uint get_random_string(char *buf);
 static statement *build_table_string(void);
@@ -1264,7 +1265,13 @@ get_options(int *argc,char ***argv)
  if (num_int_cols_opt)
  {
  option_string *str;
- parse_option(num_int_cols_opt, &str, ',');
+ if(parse_option(num_int_cols_opt, &str, ',') == -1)
+ {
+ fprintf(stderr, "Invalid value specified for the option "
+ "'number-int-cols'\n");
+ option_cleanup(str);
+ return 1;
+ }
  num_int_cols= atoi(str->string);
  if (str->option)
  num_int_cols_index= atoi(str->option);
@@ -1275,7 +1282,13 @@ get_options(int *argc,char ***argv)
  if (num_char_cols_opt)
  {
  option_string *str;
- parse_option(num_char_cols_opt, &str, ',');
+ if(parse_option(num_char_cols_opt, &str, ',') == -1)
+ {
+ fprintf(stderr, "Invalid value specified for the option "
+ "'number-char-cols'\n");
+ option_cleanup(str);
+ return 1;
+ }
  num_char_cols= atoi(str->string);
  if (str->option)
  num_char_cols_index= atoi(str->option);
@@ -1512,7 +1525,13 @@ get_options(int *argc,char ***argv)
  printf("Parsing engines to use.\n");
 
  if (default_engine)
- parse_option(default_engine, &engine_options, ',');
+ {
+ if(parse_option(default_engine, &engine_options, ',') == -1)
+ {
+ fprintf(stderr, "Invalid value specified for the option 'engine'\n");
+ return 1;
+ }
+ }
 
  if (tty_password)
  opt_password= get_tty_password(NullS);
@@ -1989,7 +2008,7 @@ pthread_handler_t run_task(void *p)
  DBUG_RETURN(0);
 }
 
-uint
+int
 parse_option(const char *origin, option_string **stmt, char delm)
 {
  char *retstr;
@@ -2014,6 +2033,13 @@ parse_option(const char *origin, option_string **stmt, char delm)
  char buffer[HUGE_STRING_LENGTH]= "";
  char *buffer_ptr;
 
+ /*
+ Return an error if the length of the any of the comma seprated value
+ exceeds HUGE_STRING_LENGTH.
+ */
+ if ((size_t)(retstr - ptr) > HUGE_STRING_LENGTH)
+ return -1;
+
  count++;
  strncpy(buffer, ptr, (size_t)(retstr - ptr));
  /*
@@ -2053,6 +2079,13 @@ parse_option(const char *origin, option_string **stmt, char delm)
  {
  char *origin_ptr;
 
+ /*
+ Return an error if the length of the any of the comma seprated value
+ exceeds HUGE_STRING_LENGTH.
+ */
+ if (strlen(ptr) > HUGE_STRING_LENGTH)
+ return -1;
+
  if ((origin_ptr= strchr(ptr, ':')))
  {
  char *option_ptr;
@@ -2063,13 +2096,13 @@ parse_option(const char *origin, option_string **stmt, char delm)
  option_ptr= (char *)ptr + 1 + tmp->length;
 
  /* Move past the : and the first string */
- tmp->option_length= (size_t)((ptr + length) - option_ptr);
+ tmp->option_length= strlen(option_ptr);
  tmp->option= my_strndup(option_ptr, tmp->option_length,
  MYF(MY_FAE));
  }
  else
  {
- tmp->length= (size_t)((ptr + length) - ptr);
+ tmp->length= strlen(ptr);
  tmp->string= my_strndup(ptr, tmp->length, MYF(MY_FAE));
  }
 

cmake/check_compiler_flag.cmake

@@ -9,19 +9,22 @@ SET(fail_patterns
  FAIL_REGEX "unrecognized .*option"
  FAIL_REGEX "ignoring unknown option"
  FAIL_REGEX "warning:.*ignored"
+ FAIL_REGEX "warning:.*is valid for.*but not for"
  FAIL_REGEX "warning:.*redefined"
  FAIL_REGEX "[Ww]arning: [Oo]ption"
  )
 
-MACRO (MY_CHECK_C_COMPILER_FLAG flag result)
+MACRO (MY_CHECK_C_COMPILER_FLAG flag)
+ STRING(REGEX REPLACE "[-,= ]" "_" result "HAVE_C_${flag}")
  SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}")
  CHECK_C_SOURCE_COMPILES("int main(void) { return 0; }" ${result}
  ${fail_patterns})
  SET(CMAKE_REQUIRED_FLAGS "${SAVE_CMAKE_REQUIRED_FLAGS}")
 ENDMACRO()
 
-MACRO (MY_CHECK_CXX_COMPILER_FLAG flag result)
+MACRO (MY_CHECK_CXX_COMPILER_FLAG flag)
+ STRING(REGEX REPLACE "[-,= ]" "_" result "HAVE_CXX_${flag}")
  SET(SAVE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}")
  CHECK_CXX_SOURCE_COMPILES("int main(void) { return 0; }" ${result}
@@ -35,10 +38,11 @@ FUNCTION(MY_CHECK_AND_SET_COMPILER_FLAG flag)
  IF(WIN32)
  RETURN()
  ENDIF()
- MY_CHECK_C_COMPILER_FLAG(${flag} HAVE_C_${flag})
- MY_CHECK_CXX_COMPILER_FLAG(${flag} HAVE_CXX_${flag})
+ MY_CHECK_C_COMPILER_FLAG(${flag})
+ MY_CHECK_CXX_COMPILER_FLAG(${flag})
+ STRING(REGEX REPLACE "[-,= ]" "_" result "${flag}")
  FOREACH(lang C CXX)
- IF (HAVE_${lang}_${flag})
+ IF (HAVE_${lang}_${result})
  IF(ARGN)
  FOREACH(type ${ARGN})
  SET(CMAKE_${lang}_FLAGS_${type} "${CMAKE_${lang}_FLAGS_${type}} ${flag}" PARENT_SCOPE)

cmake/maintainer.cmake

@@ -15,8 +15,8 @@
 
 # Common warning flags for GCC, G++, Clang and Clang++
 SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security -Wno-init-self")
-MY_CHECK_C_COMPILER_FLAG("-Wvla" HAVE_WVLA) # Requires GCC 4.3+ or Clang
-IF(HAVE_WVLA)
+MY_CHECK_C_COMPILER_FLAG("-Wvla") # Requires GCC 4.3+ or Clang
+IF(HAVE_C__Wvla)
  SET(MY_WARNING_FLAGS "${MY_WARNING_FLAGS} -Wvla")
 ENDIF()
 

cmake/ssl.cmake

@@ -147,7 +147,6 @@ MACRO (MYSQL_CHECK_SSL)
  IF (WITH_SSL_PATH)
  LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
  ENDIF()
- MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
  FIND_LIBRARY(OPENSSL_LIBRARIES
  NAMES ssl ssleay32 ssleay32MD
  HINTS ${OPENSSL_ROOT_DIR}/lib)