Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks

Author: spetrunia

cmake/mysql_version.cmake

@@ -69,13 +69,9 @@ ENDMACRO()
 # Get mysql version and other interesting variables
 GET_MYSQL_VERSION()
 
-SET(MYSQL_TCP_PORT_DEFAULT "3306")
-
+SET(MYSQL_TCP_PORT_DEFAULT 0)
 IF(NOT MYSQL_TCP_PORT)
-  SET(MYSQL_TCP_PORT ${MYSQL_TCP_PORT_DEFAULT})
-  SET(MYSQL_TCP_PORT_DEFAULT "0")
-ELSEIF(MYSQL_TCP_PORT EQUAL MYSQL_TCP_PORT_DEFAULT)
-  SET(MYSQL_TCP_PORT_DEFAULT "0")
+  SET(MYSQL_TCP_PORT 3306)
 ENDIF()
 
 IF(NOT COMPILATION_COMMENT)

extra/mariabackup/xtrabackup.cc

@@ -2460,7 +2460,7 @@ static os_thread_ret_t log_copying_thread(void*)
 
 	log_copying_running = false;
 	my_thread_end();
-	os_thread_exit(NULL);
+	os_thread_exit();
 
 	return(0);
 }
@@ -2483,7 +2483,7 @@ static os_thread_ret_t io_watching_thread(void*)
 
 	io_watching_thread_running = false;
 
-	os_thread_exit(NULL);
+	os_thread_exit();
 
 	return(0);
 }
@@ -2523,7 +2523,7 @@ data_copy_thread_func(
 	pthread_mutex_unlock(&ctxt->count_mutex);
 
 	my_thread_end();
-	os_thread_exit(NULL);
+	os_thread_exit();
 	OS_THREAD_DUMMY_RETURN;
 }
 

mysql-test/lib/My/SafeProcess.pm

@@ -336,9 +336,14 @@ sub start_kill {
 
 sub dump_core {
   my ($self)= @_;
-  return if IS_WINDOWS;
   my $pid= $self->{SAFE_PID};
   die "Can't get core from not started process" unless defined $pid;
+
+  if (IS_WINDOWS) {
+    system("$safe_kill $pid dump");
+    return 1;
+  }
+
   _verbose("Sending ABRT to $self");
   kill ("ABRT", $pid);
   return 1;

mysql-test/lib/My/SafeProcess/CMakeLists.txt

@@ -25,6 +25,7 @@ SET(INSTALL_ARGS
 IF (WIN32)
   MYSQL_ADD_EXECUTABLE(my_safe_process safe_process_win.cc ${INSTALL_ARGS})
   MYSQL_ADD_EXECUTABLE(my_safe_kill safe_kill_win.cc ${INSTALL_ARGS})
+  TARGET_LINK_LIBRARIES(my_safe_kill dbghelp psapi)
 ELSE()
   MYSQL_ADD_EXECUTABLE(my_safe_process safe_process.cc ${INSTALL_ARGS})
 ENDIF()

mysql-test/lib/My/SafeProcess/safe_kill_win.cc

@@ -25,6 +25,80 @@
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <psapi.h>
+#include <DbgHelp.h>
+
+static int create_dump(DWORD pid)
+{
+  char path[MAX_PATH];
+  char working_dir[MAX_PATH];
+  int ret= -1;
+  HANDLE process= INVALID_HANDLE_VALUE;
+  HANDLE file= INVALID_HANDLE_VALUE;
+  char *p;
+
+  process = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, (DWORD)pid);
+  if (!process)
+  {
+    fprintf(stderr,"safe_kill : cannot open process pid=%u to create dump, last error %u\n",
+      pid, GetLastError());
+    goto exit;
+  }
+
+  DWORD size = MAX_PATH;
+  if (QueryFullProcessImageName(process, 0, path, &size) == 0)
+  {
+    fprintf(stderr,"safe_kill : cannot read process path for pid %u, last error %u\n",
+      pid, GetLastError());
+    goto exit;
+  }
+
+  if ((p = strrchr(path, '.')) == 0)
+    p= path + strlen(path);
+
+  strncpy(p, ".dmp", path + MAX_PATH - p);
+
+  /* Create dump in current directory.*/
+  const char *filename= strrchr(path, '\\');
+  if (filename == 0)
+    filename = path;
+  else
+    filename++;
+
+  if (!GetCurrentDirectory(MAX_PATH, working_dir))
+  {
+    fprintf(stderr, "GetCurrentDirectory failed, last error %u",GetLastError());
+    goto exit;
+  }
+
+  file = CreateFile(filename, GENERIC_READ | GENERIC_WRITE,
+    0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+
+  if (file == INVALID_HANDLE_VALUE)
+  {
+    fprintf(stderr,"safe_kill : CreateFile() failed for file %s, working dir %s, last error = %u\n",
+      filename, working_dir, GetLastError());
+    goto exit;
+  }
+
+  if (!MiniDumpWriteDump(process, pid, file, MiniDumpNormal, 0,0,0))
+  {
+    fprintf(stderr, "Failed to write minidump to %s, working dir %s, last error %u\n",
+      filename, working_dir, GetLastError());
+    goto exit;
+  }
+
+  ret = 0;
+  fprintf(stderr, "Minidump written to %s, directory %s\n", filename, working_dir);
+
+exit:
+  if(process!= 0 && process != INVALID_HANDLE_VALUE)
+    CloseHandle(process);
+
+  if (file != 0 && file != INVALID_HANDLE_VALUE)
+    CloseHandle(file);
+  return ret;
+}
 
 int main(int argc, const char** argv )
 {
@@ -37,12 +111,16 @@ int main(int argc, const char** argv )
   signal(SIGBREAK, SIG_IGN);
   signal(SIGTERM,  SIG_IGN);
 
-  if (argc != 2) {
-    fprintf(stderr, "safe_kill <pid>\n");
+  if ((argc != 2 && argc != 3) || (argc == 3 && strcmp(argv[2],"dump"))) {
+    fprintf(stderr, "safe_kill <pid> [dump]\n");
     exit(2);
   }
   pid= atoi(argv[1]);
 
+  if (argc == 3)
+  {
+    return create_dump(pid);
+  }
   _snprintf(safe_process_name, sizeof(safe_process_name),
             "safe_process[%d]", pid);
 

mysql-test/suite/innodb/r/alter_table.result

@@ -11,3 +11,14 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
 drop table t1;
 set @@sql_mode=default;
+create table t1 (
+id1    int(11)      not null auto_increment,
+id2    varchar(30)  not null,
+id3    datetime     not null default current_timestamp,
+primary key (id1),
+unique key unique_id2 (id2)
+) engine=innodb;
+alter table t1 change column id2 id4 varchar(100) not null;
+select * from t1 where id4 like 'a';
+id1	id4	id3
+drop table t1;

mysql-test/suite/innodb/r/innodb-alter.result

@@ -640,10 +640,8 @@ CHANGE foo_id FTS_DOC_ID BIGINT UNSIGNED NOT NULL;
 ALTER TABLE t1o DROP INDEX ct, DROP INDEX FTS_DOC_ID_INDEX,
 CHANGE FTS_DOC_ID foo_id BIGINT UNSIGNED NOT NULL;
 ALTER TABLE t1o ADD UNIQUE INDEX FTS_DOC_ID_INDEX(foo_id);
-call mtr.add_suppression("InnoDB: No matching column for `FTS_DOC_ID` in index `ct` of table `test`\\.`t1o`");
 ALTER TABLE t1o CHANGE foo_id FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
 ADD FULLTEXT INDEX(ct);
-ERROR HY000: Index for table 't1o' is corrupt; try to repair it
 DROP TABLE sys_indexes;
 CREATE TABLE sys_indexes SELECT i.* FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES i
 INNER JOIN sys_tables st ON i.TABLE_ID=st.TABLE_ID;

mysql-test/suite/innodb/t/alter_table.test

@@ -8,3 +8,17 @@ create index idx1 on t1(a(3073));
 show create table t1;
 drop table t1;
 set @@sql_mode=default;
+
+#
+# MDEV-14081 ALTER TABLE CHANGE COLUMN Corrupts Index Leading to Crashes in 10.2
+#
+create table t1 (
+  id1    int(11)      not null auto_increment,
+  id2    varchar(30)  not null,
+  id3    datetime     not null default current_timestamp,
+  primary key (id1),
+  unique key unique_id2 (id2)
+) engine=innodb;
+alter table t1 change column id2 id4 varchar(100) not null;
+select * from t1 where id4 like 'a';
+drop table t1;

mysql-test/suite/innodb/t/innodb-alter.test

@@ -370,16 +370,8 @@ CHANGE FTS_DOC_ID foo_id BIGINT UNSIGNED NOT NULL;
 
 ALTER TABLE t1o ADD UNIQUE INDEX FTS_DOC_ID_INDEX(foo_id);
 
-# FIXME: MDEV-9469 'Incorrect key file' on ALTER TABLE
-call mtr.add_suppression("InnoDB: No matching column for `FTS_DOC_ID` in index `ct` of table `test`\\.`t1o`");
---error ER_NOT_KEYFILE
 ALTER TABLE t1o CHANGE foo_id FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
 ADD FULLTEXT INDEX(ct);
-# FIXME: MDEV-9469 (enable this)
-#--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
-#ALTER TABLE t1o CHANGE FTS_DOC_ID foo_id BIGINT UNSIGNED NOT NULL,
-#ALGORITHM=INPLACE;
-#end of MDEV-9469 FIXME
 
 DROP TABLE sys_indexes;
 CREATE TABLE sys_indexes SELECT i.* FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES i

mysql-test/suite/innodb_fts/r/truncate.result

@@ -0,0 +1,31 @@
+#
+# Bug#25053705 - INVALID I/O ON TABLE AFTER TRUNCATE
+#
+CREATE TABLE t1 (a INT, d INT, b VARCHAR(198), c CHAR(158), FULLTEXT fts1(c,b),
+FULLTEXT fts2(c));
+TRUNCATE TABLE t1;
+INSERT INTO t1 (a,d,b,c) VALUES (
+'79795','6',repeat('uololoaroolccaaruolraloouuoocorrcorurlu','1'),
+repeat('orouculcaocuocloooolooloooaorlroclouulrrucclulalouaulrluorooaclllluuorc
+cuullucocraloracurooulrooauuar','1'));
+CREATE TABLE t2 (a INT, d INT, b VARCHAR(198), c CHAR(158), FULLTEXT fts1(c,b));
+INSERT INTO t2 VALUES (1, 1, repeat('uololoaroolccaaruolraloouuoocorrcorurlu','1'),
+repeat('orouculcaocuocloooolooloooaorlroclouulrrucclulalouaulrluorooaclllluuorccuullucocraloracurooulrooauuar','1'));
+create procedure insert_t2(IN total int)
+begin
+declare i int default 1;
+while (i <= total) DO
+insert into t2 select * from t2;
+set i = i + 1;
+end while;
+end|
+CALL insert_t2(15);
+SET @save_dbug = @@SESSION.DEBUG_DBUG;
+SET DEBUG_DBUG = '+d,innodb_invalid_read_after_truncate';
+INSERT INTO t1 (a,d,b,c) VALUES (
+'7795','6',repeat('uololoaroolccaaruolraloouuoocorrcorurlu','1'),
+repeat('orouculcaocuocloooolooloooaorlroclouulrrucclulalouaulrluorooaclllluuorc
+cuullucocraloracurooulrooauuar','1'));
+SET DEBUG_DBUG = @save_dbug;
+DROP PROCEDURE insert_t2;
+DROP TABLE t1,t2;