Merge branch '10.1' into 10.2

Author: sanja-byelkin

dbug/dbug.c

@@ -226,11 +226,8 @@ typedef struct _db_code_state_ {
   const char *file;             /* Name of current user file                */
   struct _db_stack_frame_ *framep; /* Pointer to current frame              */
   struct settings *stack;       /* debugging settings                       */
-  const char *jmpfunc;          /* Remember current function for setjmp     */
-  const char *jmpfile;          /* Remember current file for setjmp         */
   int lineno;                   /* Current debugger output line number      */
   uint level;                   /* Current function nesting level           */
-  int jmplevel;                 /* Remember nesting level at setjmp()       */
 
 /*
  *      The following variables are used to hold the state information

debian/additions/my.cnf

@@ -131,8 +131,6 @@ max_binlog_size         = 100M
 # InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
 # Read the manual for more InnoDB related options. There are many!
 default_storage_engine	= InnoDB
-# you can't just change log file size, requires special procedure
-#innodb_log_file_size	= 50M
 innodb_buffer_pool_size	= 256M
 innodb_log_buffer_size	= 8M
 innodb_file_per_table	= 1

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

@@ -567,7 +567,7 @@ Variable_name	Value
 auto_increment_increment	65535
 auto_increment_offset	65535
 INSERT INTO t1 VALUES (NULL),(NULL);
-ERROR HY000: Failed to read auto-increment value from storage engine
+ERROR 22003: Out of range value for column 'c1' at row 1
 SELECT * FROM t1;
 c1
 1
@@ -677,7 +677,7 @@ SELECT a,b FROM t;
 a	b
 1	S1
 3	S2
-4	S2
+5	S2
 disconnect con1;
 connection default;
 # Client 1: Insert a record with auto_increment_increment=1
@@ -688,14 +688,14 @@ t	CREATE TABLE `t` (
   `a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `b` varchar(200) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=latin1
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1
 INSERT INTO t(b) VALUES('S1');
 SELECT a,b FROM t;
 a	b
 1	S1
 3	S2
-4	S2
-5	S1
+5	S2
+6	S1
 DROP TABLE t;
 # Autoincrement behaviour with mixed insert.
 CREATE TABLE t(
@@ -733,22 +733,22 @@ t	CREATE TABLE `t` (
   `a` tinyint(4) NOT NULL AUTO_INCREMENT,
   `b` varchar(200) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=latin1
+) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=latin1
 INSERT INTO t(b) VALUES('S4');
 SELECT * FROM t;
 a	b
 1	S0
 11	S1
-22	S3
-23	S4
 28	S2
+31	S3
+32	S4
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `a` tinyint(4) NOT NULL AUTO_INCREMENT,
   `b` varchar(200) DEFAULT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=latin1
+) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=latin1
 DROP TABLE t;
 SET @@SESSION.AUTO_INCREMENT_INCREMENT=1, @@SESSION.AUTO_INCREMENT_OFFSET=5;
 DROP TABLE IF EXISTS t1;
@@ -789,7 +789,7 @@ t2	CREATE TABLE `t2` (
   `n` int(10) unsigned NOT NULL,
   `o` enum('FALSE','TRUE') DEFAULT NULL,
   PRIMARY KEY (`m`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1
+) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=latin1
 INSERT INTO t1 (b,c) SELECT n,o FROM t2 ;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1472,13 +1472,13 @@ SELECT * FROM t;
 i
 1
 301
-351
+601
 SHOW CREATE TABLE t;
 Table	Create Table
 t	CREATE TABLE `t` (
   `i` int(11) NOT NULL AUTO_INCREMENT,
   KEY `i` (`i`)
-) ENGINE=InnoDB AUTO_INCREMENT=401 DEFAULT CHARSET=latin1
+) ENGINE=InnoDB AUTO_INCREMENT=651 DEFAULT CHARSET=latin1
 DROP TABLE t;
 SET auto_increment_increment = DEFAULT;
 #

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

@@ -349,7 +349,7 @@ INSERT INTO t1 VALUES (18446744073709551610); #-- 2^64 - 2
 SELECT * FROM t1;
 SET @@SESSION.AUTO_INCREMENT_INCREMENT=1152921504606846976, @@SESSION.AUTO_INCREMENT_OFFSET=1152921504606846976;
 SHOW VARIABLES LIKE "auto_inc%";
---error 1467
+--error HA_ERR_AUTOINC_ERANGE
 INSERT INTO t1 VALUES (NULL),(NULL);
 SELECT * FROM t1;
 DROP TABLE t1;

mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled

@@ -1215,7 +1215,7 @@
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL
 -GLOBAL_VALUE	5.6.45
-+GLOBAL_VALUE	5.6.44-86.0
++GLOBAL_VALUE	5.6.45-86.1
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	NULL
  VARIABLE_SCOPE	GLOBAL

mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled

@@ -685,7 +685,7 @@
  VARIABLE_NAME	INNODB_VERSION
  SESSION_VALUE	NULL
 -GLOBAL_VALUE	5.6.45
-+GLOBAL_VALUE	5.6.44-86.0
++GLOBAL_VALUE	5.6.45-86.1
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	NULL
  VARIABLE_SCOPE	GLOBAL

sql/sql_show.cc

@@ -7861,8 +7861,7 @@ TABLE *create_schema_table(THD *thd, TABLE_LIST *table_list)
     item->maybe_null= (fields_info->field_flags & MY_I_S_MAYBE_NULL);
     field_count++;
   }
-  TMP_TABLE_PARAM *tmp_table_param =
-    (TMP_TABLE_PARAM*) (thd->alloc(sizeof(TMP_TABLE_PARAM)));
+  TMP_TABLE_PARAM *tmp_table_param = new (thd->mem_root) TMP_TABLE_PARAM;
   tmp_table_param->init();
   tmp_table_param->table_charset= cs;
   tmp_table_param->field_count= field_count;

storage/connect/CMakeLists.txt

@@ -73,6 +73,10 @@ ELSE(NOT UNIX)
   tabwmi.cpp tabwmi.h tabmac.cpp tabmac.h macutil.cpp macutil.h)
   # Add exception handling to the CONNECT project)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD")
+  SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MD")
   SET(IPHLPAPI_LIBRARY iphlpapi.lib)
   IF(MSVC AND (CMAKE_CXX_COMPILER_ID MATCHES Clang))
     # Connect does not work with clang-cl

storage/connect/inihandl.cpp

@@ -194,7 +194,7 @@ static void PROFILE_Save( FILE *file, PROFILESECTION *section )
     }
 
     for (key = section->key; key; key = key->next)
-      if (key->name[0]) {
+      if (key->name && key->name[0]) {
         fprintf(file, "%s", SVP(key->name));
 
         if (key->value)

storage/heap/ha_heap.cc

@@ -431,6 +431,10 @@ int ha_heap::reset_auto_increment(ulonglong value)
 
 int ha_heap::external_lock(THD *thd, int lock_type)
 {
+#ifndef DBUG_OFF
+  if (lock_type == F_UNLCK && file->s->changed && heap_check_heap(file, 0))
+    return HA_ERR_CRASHED;
+#endif
   return 0;					// No external locking
 }