Merge bb-10.2-ext into 10.3

.gitignore

@@ -69,6 +69,7 @@ include/sql_state.h
 include/probes_mysql.d
 include/probes_mysql_dtrace.h
 include/probes_mysql_nodtrace.h
+include/source_revision.h
 info_macros.cmake
 libmysql*/libmysql*_exports_file.cc
 libmysql*/merge_archives_mysql*.cmake

CMakeLists.txt

@@ -115,12 +115,14 @@ FOREACH(_base
   ENDIF()
 ENDFOREACH()
 
-FOREACH(tool gtar tar git)
+FOREACH(tool gtar tar)
  STRING(TOUPPER ${tool}  TOOL)
  FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
  MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
 ENDFOREACH()
 
+FIND_PACKAGE(Git)
+
 # Following autotools tradition, add preprocessor definitions
 # specified in environment variable CPPFLAGS
 IF(DEFINED ENV{CPPFLAGS})
@@ -443,7 +445,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
     ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc)
 
-FIND_PACKAGE(Git)
 IF(GIT_EXECUTABLE)
   EXECUTE_PROCESS(
     COMMAND ${GIT_EXECUTABLE} rev-parse HEAD

README.md

@@ -17,7 +17,7 @@ see the Credits appendix.  You can also run 'SHOW authors' to get a
 list of active contributors.
 
 A description of the MariaDB project and a manual can be found at:
-http://mariadb.org/
+https://mariadb.org/
 https://mariadb.com/kb/en/
 https://mariadb.com/kb/en/mariadb-vs-mysql-features/
 https://mariadb.com/kb/en/mariadb-versus-mysql-features/
@@ -55,9 +55,9 @@ Bug Reports:
 ------------
 
 Bug and/or error reports regarding MariaDB should be submitted at
-http://mariadb.org/jira
+https://mariadb.org/jira
 
-Bugs in the MySQL code can also be submitted at http://bugs.mysql.com
+Bugs in the MySQL code can also be submitted at https://bugs.mysql.com
 
 The code for MariaDB, including all revision history, can be found at:
 https://github.com/MariaDB/server

cmake/systemd.cmake

@@ -13,11 +13,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-INCLUDE(FindPkgConfig)
-# http://www.cmake.org/cmake/help/v3.0/module/FindPkgConfig.html
-
 MACRO(CHECK_SYSTEMD)
   IF(UNIX)
+    INCLUDE(FindPkgConfig)
+    # http://www.cmake.org/cmake/help/v3.0/module/FindPkgConfig.html
     SET(WITH_SYSTEMD "auto" CACHE STRING "Enable systemd scripts and notification support")
     IF(WITH_SYSTEMD STREQUAL "yes" OR WITH_SYSTEMD STREQUAL "auto")
       IF(PKG_CONFIG_FOUND)

mysql-test/extra/rpl_tests/rpl_cant_read_event_incident.inc

@@ -18,8 +18,8 @@
 # and replication is started from it.
 #
 
---source include/master-slave.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 
 --connection slave
 # Make sure the slave is stopped while we are messing with master.

mysql-test/extra/rpl_tests/rpl_checksum.inc

@@ -7,9 +7,9 @@
 # WL2540 replication events checksum
 # Testing configuration parameters
 
---source include/master-slave.inc
 --source include/have_debug.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 
 call mtr.add_suppression('Slave can not handle replication events with the checksum that master is configured to log');
 call mtr.add_suppression('Replication event checksum verification failed');

mysql-test/extra/rpl_tests/rpl_init_slave_errors.inc

@@ -35,8 +35,8 @@
 #                    Configuring the Environment
 ######################################################################
 source include/have_debug.inc;
-source include/master-slave.inc;
 source include/have_log_bin.inc;
+source include/master-slave.inc;
 
 connection slave;
 

mysql-test/extra/rpl_tests/rpl_loaddata.test

@@ -11,8 +11,8 @@
 # check if START SLAVE, RESET SLAVE, CHANGE MASTER reset Last_slave_error and
 # Last_slave_errno in SHOW SLAVE STATUS (1st and 3rd commands did not: bug 986)
 
--- source include/master-slave.inc
 source include/have_innodb.inc;
+source include/master-slave.inc;
 
 --disable_query_log
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

mysql-test/extra/rpl_tests/rpl_packet.inc

@@ -15,8 +15,9 @@
 # BUG#55322: SHOW BINLOG EVENTS increases @@SESSION.MAX_ALLOWED_PACKET
 
 # max-out size db name 
-source include/master-slave.inc;
 source include/have_binlog_format_row.inc;
+source include/master-slave.inc;
+
 call mtr.add_suppression("Slave I/O: Got a packet bigger than 'slave_max_allowed_packet' bytes, .*error.* 1153");
 call mtr.add_suppression("Log entry on master is longer than slave_max_allowed_packet");
 let $db= DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________;

mysql-test/extra/rpl_tests/rpl_skip_replication.inc

@@ -16,8 +16,8 @@
 # so if it is needed, it should be set explicitly before each call.
 #
 
---source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 
 connection slave;
 # Test that SUPER is required to change @@replicate_events_marked_for_skip.

mysql-test/extra/rpl_tests/rpl_stm_relay_ign_space.inc

@@ -25,8 +25,8 @@
 # IO thread does not do it in an uncontrolled manner.
 
 --source include/have_binlog_format_statement.inc
---source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 
 --disable_query_log
 CREATE TABLE t1 (c1 TEXT) engine=InnoDB;

mysql-test/extra/rpl_tests/rpl_sync.inc

@@ -32,12 +32,12 @@
 #                                Configuring the environment
 ########################################################################################
 --echo =====Configuring the enviroment=======;
---source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_valgrind.inc
 --source include/have_debug.inc
 --source include/have_innodb.inc
 --source include/not_crashrep.inc
+--source include/master-slave.inc
 
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");

mysql-test/r/explain_json.result

@@ -1525,12 +1525,12 @@ ANALYZE
         "key_length": "5",
         "used_key_parts": ["a"],
         "ref": ["test.t3.a"],
-        "r_loops": 0,
+        "r_loops": 1,
         "rows": 1,
-        "r_rows": null,
+        "r_rows": 10,
         "r_total_time_ms": "REPLACED",
         "filtered": 100,
-        "r_filtered": null,
+        "r_filtered": 100,
         "index_condition_bka": "t4.b + 1 <= t3.b + 1"
       },
       "buffer_type": "flat",

mysql-test/r/insert.result

@@ -745,3 +745,9 @@ f1	f2
 drop view v1;
 drop table t1;
 SET @@sql_mode= @save_mode;
+CREATE TABLE t1 (f INT);
+CREATE VIEW v1 AS SELECT * FROM t1 WHERE f <=> 'foo' WITH CHECK OPTION;
+REPLACE INTO v1 SET f = NULL;
+ERROR 22007: Truncated incorrect DOUBLE value: 'foo'
+DROP VIEW v1;
+DROP TABLE t1;

mysql-test/r/locale.result

@@ -229,15 +229,80 @@ SET lc_time_names=@old_50915_lc_time_names;
 # End of 10.1 tests
 #
 create view v1 as select
+date_format('2001-10-02', '%c %b %M') as a,
+date_format('2001-10-02', '%c %b %M', 'ru_RU') as a1,
 format(123456789,2) as b,
 format(123456789,2,'rm_CH') as b1;
 select * from v1;
-b	b1
-123,456,789.00	123'456'789,00
+a	a1	b	b1
+10 Oct October	10 Окт Октября	123,456,789.00	123'456'789,00
 show create view v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1`	utf8	utf8_general_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select date_format('2001-10-02','%c %b %M') AS `a`,date_format('2001-10-02','%c %b %M','ru_RU') AS `a1`,format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1`	utf8	utf8_general_ci
 drop view v1;
 #
 # End of 10.2 tests
 #
+select date_format('2001-01-01', '%w %a %W', 'ro_RO');
+date_format('2001-01-01', '%w %a %W', 'ro_RO')
+1 Lu Luni
+select date_format('2001-01-03', '%w %a %W', 'ro_RO');
+date_format('2001-01-03', '%w %a %W', 'ro_RO')
+3 Mi Miercuri
+select date_format('2001-01-05', '%w %a %W', 'ro_RO');
+date_format('2001-01-05', '%w %a %W', 'ro_RO')
+5 Vi Vineri
+select date_format('2001-01-07', '%w %a %W', 'ro_RO');
+date_format('2001-01-07', '%w %a %W', 'ro_RO')
+0 Du Duminică
+select date_format('2001-01-01', '%w %a %W', 'de_AT');
+date_format('2001-01-01', '%w %a %W', 'de_AT')
+1 Mon Montag
+select date_format('2001-02-01', '%w %a %W', 'de_AT');
+date_format('2001-02-01', '%w %a %W', 'de_AT')
+4 Don Donnerstag
+select date_format('2001-03-01', '%w %a %W', 'de_AT');
+date_format('2001-03-01', '%w %a %W', 'de_AT')
+4 Don Donnerstag
+select date_format('2001-01-01', '%w %a %W', 'en_US');
+date_format('2001-01-01', '%w %a %W', 'en_US')
+1 Mon Monday
+select date_format('2001-03-01', '%c %b %M', 'en_US');
+date_format('2001-03-01', '%c %b %M', 'en_US')
+3 Mar March
+select date_format('2001-01-01', '%w %a %W', 'rm_CH');
+date_format('2001-01-01', '%w %a %W', 'rm_CH')
+1 gli glindesdi
+select date_format('2001-01-03', '%w %a %W', 'rm_CH');
+date_format('2001-01-03', '%w %a %W', 'rm_CH')
+3 me mesemna
+select date_format('2001-01-05', '%w %a %W', 'rm_CH');
+date_format('2001-01-05', '%w %a %W', 'rm_CH')
+5 ve venderdi
+select date_format('2001-01-07', '%w %a %W', 'rm_CH');
+date_format('2001-01-07', '%w %a %W', 'rm_CH')
+0 du dumengia
+select date_format('2001-02-01', '%c %b %M', 'rm_CH');
+date_format('2001-02-01', '%c %b %M', 'rm_CH')
+2 favr favrer
+select date_format('2001-04-01', '%c %b %M', 'rm_CH');
+date_format('2001-04-01', '%c %b %M', 'rm_CH')
+4 avr avrigl
+select date_format('2001-06-01', '%c %b %M', 'rm_CH');
+date_format('2001-06-01', '%c %b %M', 'rm_CH')
+6 zercl zercladur
+select date_format('2001-08-01', '%c %b %M', 'rm_CH');
+date_format('2001-08-01', '%c %b %M', 'rm_CH')
+8 avust avust
+select date_format('2001-10-01', '%c %b %M', 'rm_CH');
+date_format('2001-10-01', '%c %b %M', 'rm_CH')
+10 oct october
+select date_format('2001-12-01', '%c %b %M', 'rm_CH');
+date_format('2001-12-01', '%c %b %M', 'rm_CH')
+12 dec december
+select date_format('2001-01-06', '%w %a %W', 'de_CH');
+date_format('2001-01-06', '%w %a %W', 'de_CH')
+6 Sa Samstag
+select date_format('2001-09-01', '%c %b %M', 'de_CH');
+date_format('2001-09-01', '%c %b %M', 'de_CH')
+9 Sep September

mysql-test/r/myisam.result

@@ -2569,6 +2569,14 @@ OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
 test.t1	optimize	status	OK
 DROP TABLE t1;
+CREATE TABLE t1(a INT, b CHAR(10), KEY(a), KEY(b)) engine=myisam;
+INSERT INTO t1 VALUES(1,'0'),(2,'0'),(3,'0'),(4,'0'),(5,'0'),
+(6,'0'),(7,'0');
+flush tables test.t1 for export;
+insert into t1 values (8,'0');
+ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+unlock tables;
+drop table t1;
 show variables like 'myisam_block_size';
 Variable_name	Value
 myisam_block_size	1024

mysql-test/r/old-mode.result

@@ -127,3 +127,56 @@ Warning	1264	Out of range value for column 'a' at row 1
 Warning	1264	Out of range value for column 'b' at row 1
 DROP TABLE t1;
 SET @@global.mysql56_temporal_format=DEFAULT;
+set time_zone='Europe/Moscow';
+set global mysql56_temporal_format=false;
+create table t1 (a timestamp);
+set timestamp=1288477526;
+insert t1 values (null);
+insert t1 values ();
+set timestamp=1288481126;
+insert t1 values (null);
+insert t1 values ();
+select a, unix_timestamp(a) from t1;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+2010-10-31 02:25:26	1288481126
+set global mysql56_temporal_format=true;
+select a, unix_timestamp(a) from t1;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+2010-10-31 02:25:26	1288481126
+alter table t1 modify a timestamp;
+select a, unix_timestamp(a) from t1;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+2010-10-31 02:25:26	1288481126
+drop table t1;
+set global mysql56_temporal_format=false;
+create table t1 (a timestamp);
+set timestamp=1288477526;
+insert t1 values (null);
+set timestamp=1288481126;
+insert t1 values (null);
+select a, unix_timestamp(a) from t1;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+set global mysql56_temporal_format=true;
+select a, unix_timestamp(a) from t1;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+create table t2 (a timestamp);
+insert t2 select a from t1;
+select a, unix_timestamp(a) from t2;
+a	unix_timestamp(a)
+2010-10-31 02:25:26	1288477526
+2010-10-31 02:25:26	1288481126
+drop table t1, t2;
+set time_zone=DEFAULT;

mysql-test/suite/engines/funcs/t/rpl_insert.test

@@ -2,9 +2,9 @@
 --echo # Bug#20821: INSERT DELAYED fails to write some rows to binlog
 --echo #
 
---source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_windows.inc
+--source include/master-slave.inc
 
 --disable_warnings
 CREATE SCHEMA IF NOT EXISTS mysqlslap;

mysql-test/suite/innodb/r/innodb-table-online.result

@@ -167,7 +167,8 @@ ROLLBACK;
 connection con1;
 KILL QUERY @id;
 ERROR 70100: Query execution was interrupted
-SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR kill_done';
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml_done';
+SET DEBUG_SYNC = 'row_log_table_apply2_before SIGNAL applied WAIT_FOR kill_done';
 ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 # session default
 connection default;
@@ -180,6 +181,10 @@ ddl_online_create_index	1
 ddl_pending_alter_table	1
 ddl_sort_file_alter_table	0
 ddl_log_file_alter_table	0
+BEGIN;
+INSERT INTO t1 VALUES(7,4,2);
+ROLLBACK;
+SET DEBUG_SYNC = 'now SIGNAL dml_done WAIT_FOR applied';
 KILL QUERY @id;
 SET DEBUG_SYNC = 'now SIGNAL kill_done';
 # session con1
@@ -227,6 +232,7 @@ t1	CREATE TABLE `t1` (
   `c3` char(255) NOT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
 SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL rebuilt2 WAIT_FOR dml2_done';
 SET lock_wait_timeout = 10;
 ALTER TABLE t1 ROW_FORMAT=COMPACT, ALGORITHM = INPLACE;

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

@@ -1,6 +1,9 @@
 #
 # Bug #23070734	CONCURRENT TRUNCATE TABLES CAUSE STALLS
 #
+SET @ahi= @@global.innodb_adaptive_hash_index;
+SET GLOBAL innodb_adaptive_hash_index=OFF;
+SET GLOBAL innodb_adaptive_hash_index=ON;
 Test_1 :- Check if DDL operations are possible on
 table being truncated. Also check if
 DDL operations on other tables succeed.
@@ -81,6 +84,5 @@ connection con2;
 disconnect con2;
 connection default;
 SET DEBUG_SYNC= 'RESET';
-SET session lock_wait_timeout=default;
-set global innodb_adaptive_hash_index=on;
+SET GLOBAL innodb_adaptive_hash_index=@ahi;
 drop table t1,t2,t3;

mysql-test/suite/innodb/t/innodb-index-online.test

@@ -1,5 +1,6 @@
 --source include/innodb_page_size_small.inc
 --source include/innodb_encrypt_log.inc
+--source include/have_debug.inc
 --source include/have_debug_sync.inc
 
 let $innodb_metrics_select=