Merge branch '10.2' into bb-10.2-ext

MariaDB · Sep 23, 2017 · 1320ad5 · 1320ad5
2 parents 88adfd0 + ca3c8d9
commit 1320ad5
Show file tree

Hide file tree

Showing 104 changed files with 459 additions and 162 deletions.
diff --git a/cmake/CMakeLis.txt b/cmake/CMakeLis.txt
diff --git a/cmake/systemd.cmake b/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)

diff --git a/mysql-test/extra/rpl_tests/rpl_cant_read_event_incident.inc b/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.

diff --git a/mysql-test/extra/rpl_tests/rpl_checksum.inc b/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');

diff --git a/mysql-test/extra/rpl_tests/rpl_init_slave_errors.inc b/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;
 

diff --git a/mysql-test/extra/rpl_tests/rpl_loaddata.test b/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");

diff --git a/mysql-test/extra/rpl_tests/rpl_packet.inc b/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_____________________;

diff --git a/mysql-test/extra/rpl_tests/rpl_skip_replication.inc b/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.

diff --git a/mysql-test/extra/rpl_tests/rpl_stm_relay_ign_space.inc b/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;

diff --git a/mysql-test/extra/rpl_tests/rpl_sync.inc b/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");

diff --git a/mysql-test/r/insert.result b/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;
diff --git a/mysql-test/r/myisam.result b/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

diff --git a/mysql-test/r/old-mode.result b/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;
diff --git a/mysql-test/suite/engines/funcs/t/rpl_insert.test b/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;

diff --git a/mysql-test/suite/innodb/t/innodb-index-online.test b/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=

diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result
@@ -2790,3 +2790,11 @@ test.t1	check	status	OK
 SET aria_repair_threads=@@global.aria_repair_threads;
 SET aria_sort_buffer_size=@@global.aria_sort_buffer_size;
 DROP TABLE t1;
+CREATE TABLE t1(a INT, b CHAR(10), KEY(a), KEY(b));
+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;
diff --git a/mysql-test/suite/maria/maria.test b/mysql-test/suite/maria/maria.test
@@ -2018,6 +2018,19 @@ SET aria_repair_threads=@@global.aria_repair_threads;
 SET aria_sort_buffer_size=@@global.aria_sort_buffer_size;
 DROP TABLE t1;
 
+#
+# Check FLUSH FOR EXPORT
+#
+
+CREATE TABLE t1(a INT, b CHAR(10), KEY(a), KEY(b));
+INSERT INTO t1 VALUES(1,'0'),(2,'0'),(3,'0'),(4,'0'),(5,'0'),
+                     (6,'0'),(7,'0');
+flush tables test.t1 for export;
+--error ER_TABLE_NOT_LOCKED_FOR_WRITE
+insert into t1 values (8,'0');
+unlock tables;
+drop table t1;
+
 #
 # End of test
 #

diff --git a/mysql-test/suite/parts/t/rpl_partition.test b/mysql-test/suite/parts/t/rpl_partition.test
@@ -1,7 +1,7 @@
 --source include/have_partition.inc
 --source include/have_innodb.inc
---source include/master-slave.inc
 --source include/big_test.inc
+--source include/master-slave.inc
 
 --vertical_results
 

diff --git a/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.test b/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.test
@@ -1,5 +1,5 @@
---source include/master-slave.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 
 --enable_connect_log
 

diff --git a/mysql-test/suite/rpl/r/rpl_temporal_format_mariadb53_to_mysql56_dst.result b/mysql-test/suite/rpl/r/rpl_temporal_format_mariadb53_to_mysql56_dst.result
@@ -0,0 +1,32 @@
+include/master-slave.inc
+[connection master]
+connection slave;
+set global time_zone='Europe/Moscow';
+set time_zone='UTC';
+stop slave;
+start slave;
+connection master;
+set global mysql56_temporal_format=false;
+set global time_zone='Europe/Moscow';
+set time_zone='UTC';
+create table t1 (pk int primary key, t timestamp not null);
+set timestamp = 1288477526;
+insert into t1 values (1,null);
+set timestamp = 1288481126;
+insert into t1 values (2,null);
+connection slave;
+select pk, t, unix_timestamp(t) from t1;
+pk	t	unix_timestamp(t)
+1	2010-10-30 22:25:26	1288477526
+2	2010-10-30 23:25:26	1288481126
+set time_zone=default;
+select pk, t, unix_timestamp(t) from t1;
+pk	t	unix_timestamp(t)
+1	2010-10-31 02:25:26	1288477526
+2	2010-10-31 02:25:26	1288481126
+set global time_zone=default;
+connection master;
+drop table t1;
+set global time_zone=default;
+set global mysql56_temporal_format=default;
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_alter_extra_persistent.test b/mysql-test/suite/rpl/t/rpl_alter_extra_persistent.test
@@ -1,5 +1,5 @@
---source include/master-slave.inc
 --source include/have_binlog_format_row.inc
+--source include/master-slave.inc
 
 --enable_connect_log
 --connection master

diff --git a/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test b/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
@@ -5,9 +5,9 @@
 # is replication unsafe.
 #
 
-source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
 source include/have_innodb.inc;
+source include/master-slave.inc;
 
 call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.');
 

diff --git a/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test b/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
@@ -1,6 +1,6 @@
-source include/master-slave.inc;
 source include/have_innodb.inc;
 source include/have_binlog_format_statement.inc;
+source include/master-slave.inc;
 
 connection slave;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

diff --git a/mysql-test/suite/rpl/t/rpl_blackhole.test b/mysql-test/suite/rpl/t/rpl_blackhole.test
@@ -15,8 +15,8 @@
 # primary key lookup), and index/key with multiple matches (forcing an
 # index search).
 
-source include/master-slave.inc;
 source include/have_blackhole.inc;
+source include/master-slave.inc;
 
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 

diff --git a/mysql-test/suite/rpl/t/rpl_concurrency_error.test b/mysql-test/suite/rpl/t/rpl_concurrency_error.test
@@ -17,9 +17,9 @@
 # log, the error is ignored and only the non-transactional tables are changed.
 ###############################################################################
 
---source include/master-slave.inc
 --source include/have_innodb.inc
 --source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
 
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 

diff --git a/mysql-test/suite/rpl/t/rpl_conditional_comments.test b/mysql-test/suite/rpl/t/rpl_conditional_comments.test
@@ -8,8 +8,8 @@
 #  will be binlogged as 
 #  'INSERT INTO t1 VALUES (1) /*!10000, (2)*/ /* 99999 ,(3)*/'.
 ###############################################################################
-source include/master-slave.inc;
 source include/have_binlog_format_statement.inc;
+source include/master-slave.inc;
 
 CREATE TABLE t1(c1 INT);
 source include/show_binlog_events.inc;

diff --git a/mysql-test/suite/rpl/t/rpl_empty_master_host.test b/mysql-test/suite/rpl/t/rpl_empty_master_host.test
@@ -16,8 +16,8 @@
 #   along the way if error/no error is thrown and/or if replication starts
 #   working when expected.
 
---source include/master-slave.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 
 connection slave;
 STOP SLAVE;

diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test b/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
@@ -2,8 +2,8 @@
 # Purpose: To test having extra columns on the master WL#3915
 #############################################################
 -- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
 -- source include/have_innodb.inc
+-- source include/master-slave.inc
 
 let $engine_type = 'InnoDB';
 --source extra/rpl_tests/rpl_extra_col_master.test

diff --git a/mysql-test/suite/rpl/t/rpl_flush_logs.test b/mysql-test/suite/rpl/t/rpl_flush_logs.test
@@ -4,8 +4,8 @@
 # works fine.  
 #
 
---source include/master-slave.inc
 --source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
 connection master;
 
 # Test 'flush error logs' statement.

diff --git a/mysql-test/suite/rpl/t/rpl_geometry.test b/mysql-test/suite/rpl/t/rpl_geometry.test
@@ -1,5 +1,5 @@
-source include/master-slave.inc;
 source include/have_binlog_format_row.inc;
+source include/master-slave.inc;
 
 #
 # Bug#48776, Bug#43784

diff --git a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
@@ -8,9 +8,9 @@
 # Finish the following tests by calling its common test script:  
 # extra/rpl_tests/rpl_get_master_version_and_clock.test. 
 
-source include/master-slave.inc;
 source include/have_debug.inc;
 source include/have_debug_sync.inc;
+source include/master-slave.inc;
 
 #
 # The test is not supposed to have any binglog affairs.

diff --git a/mysql-test/suite/rpl/t/rpl_grant.test b/mysql-test/suite/rpl/t/rpl_grant.test
@@ -1,7 +1,7 @@
 # Tests of grants and users
 
-source include/master-slave.inc;
 source include/not_embedded.inc;
+source include/master-slave.inc;
 
 connection master;