Merge branch '5.5' into 10.0

2025-09-02 09:41:40 +03:00 · 2015-10-09 17:12:26 +02:00
parent bff1af983a 16c4b3c68b
commit cfeedbfd3e
92 changed files with 1929 additions and 395 deletions
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
@@ -1520,7 +1520,7 @@ BEGIN
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
-###   @1=000000124.450000000 /* DECIMAL(10,5) meta=2565 nullable=1 is_null=0 */
+###   @1=124.45000 /* DECIMAL(10,5) meta=2565 nullable=1 is_null=0 */
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
@@ -1537,7 +1537,7 @@ BEGIN
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
 ### INSERT INTO `test`.`t1`
 ### SET
-###   @1=-000000543.210000000 /* DECIMAL(10,5) meta=2565 nullable=1 is_null=0 */
+###   @1=-543.21000 /* DECIMAL(10,5) meta=2565 nullable=1 is_null=0 */
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
@@ -1554,7 +1554,7 @@ BEGIN
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
 ### DELETE FROM `test`.`t1`
 ### WHERE
-###   @1=000000124.450000000 /* DECIMAL(10,5) meta=2565 nullable=1 is_null=0 */
+###   @1=124.45000 /* DECIMAL(10,5) meta=2565 nullable=1 is_null=0 */
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
 SET TIMESTAMP=1000000000/*!*/;
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
@@ -2398,9 +2398,9 @@ BEGIN
 ###   @22=-1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=0 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -2491,9 +2491,9 @@ BEGIN
 ###   @22=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='9999:12:31' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=9999-12-31 23:59:59 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=2146522447 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -2667,9 +2667,9 @@ BEGIN
 ###   @22=-2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000001 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=1 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=2008-08-04 16:18:06 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=1217855904 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -2760,9 +2760,9 @@ BEGIN
 ###   @22=-1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=0 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -2840,9 +2840,9 @@ BEGIN
 ###   @22=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='9999:12:31' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=9999-12-31 23:59:59 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=2146522447 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -2933,9 +2933,9 @@ BEGIN
 ###   @22=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='9999:12:31' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=9999-12-31 23:59:59 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=2146522447 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3013,9 +3013,9 @@ BEGIN
 ###   @22=-1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=0 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3186,9 +3186,9 @@ BEGIN
 ###   @22=-2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000001 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=1 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=2008-08-04 16:18:06 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=1217855904 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3279,9 +3279,9 @@ BEGIN
 ###   @22=-2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000001 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=1 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=2008-08-04 16:18:06 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=1217855904 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3452,9 +3452,9 @@ BEGIN
 ###   @22=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='9999:12:31' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=9999-12-31 23:59:59 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=2146522447 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3545,9 +3545,9 @@ BEGIN
 ###   @22=-1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=0 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3638,9 +3638,9 @@ BEGIN
 ###   @22=-2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000001 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=1 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=2008-08-04 16:18:06 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=1217855904 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
@@ -2398,9 +2398,9 @@ BEGIN
 ###   @22=-1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=0 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -2494,9 +2494,9 @@ BEGIN
 ###   @22=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='9999:12:31' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=9999-12-31 23:59:59 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=2146522447 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -2672,9 +2672,9 @@ BEGIN
 ###   @22=-2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000001 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=1 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=2008-08-04 16:18:06 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=1217855904 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -2767,9 +2767,9 @@ BEGIN
 ###   @22=-1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=0 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -2847,9 +2847,9 @@ BEGIN
 ###   @22=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='9999:12:31' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=9999-12-31 23:59:59 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=2146522447 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -2942,9 +2942,9 @@ BEGIN
 ###   @22=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='9999:12:31' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=9999-12-31 23:59:59 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=2146522447 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3022,9 +3022,9 @@ BEGIN
 ###   @22=-1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=0 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3197,9 +3197,9 @@ BEGIN
 ###   @22=-2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000001 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=1 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=2008-08-04 16:18:06 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=1217855904 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3292,9 +3292,9 @@ BEGIN
 ###   @22=-2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000001 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=1 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=2008-08-04 16:18:06 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=1217855904 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3467,9 +3467,9 @@ BEGIN
 ###   @22=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='9999:12:31' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=9999-12-31 23:59:59 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=2146522447 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3562,9 +3562,9 @@ BEGIN
 ###   @22=-1.797... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=0 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000000 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=0 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='1000:01:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=1000-01-01 00:00:00 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=75601 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
@@ -3657,9 +3657,9 @@ BEGIN
 ###   @22=-2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @23=2.225... /* DOUBLE meta=8 nullable=1 is_null=0 */
 ###   @24=1 /* DOUBLE meta=8 nullable=1 is_null=0 */
-###   @25=-000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @26=000000009.999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
-###   @27=000000001 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @25=-9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @26=9999999999 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
+###   @27=1 /* DECIMAL(10,0) meta=2560 nullable=1 is_null=0 */
 ###   @28='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @29=2008-08-04 16:18:06 /* DATETIME meta=0 nullable=1 is_null=0 */
 ###   @30=1217855904 /* TIMESTAMP meta=0 nullable=0 is_null=0 */
--- a/mysql-test/suite/innodb/r/innodb_bug68148.result
+++ b/mysql-test/suite/innodb/r/innodb_bug68148.result
@@ -0,0 +1,36 @@
+set global innodb_file_per_table=1;
+CREATE TABLE ref_table1 (id int(11) NOT NULL, PRIMARY KEY(id)) ENGINE=InnoDB;
+CREATE TABLE ref_table2 (id int(11) NOT NULL, PRIMARY KEY(id)) ENGINE=InnoDB;
+CREATE TABLE `main` (
+`id` int(11) NOT NULL AUTO_INCREMENT,
+`ref_id1` int(11) NOT NULL,
+`ref_id2` int(11) NOT NULL,
+PRIMARY KEY (`id`),
+UNIQUE KEY `idx_1` (`ref_id1`,`ref_id2`),
+KEY `FK_set_out_analysis_route_id` (`ref_id2`),
+CONSTRAINT `FK_1` FOREIGN KEY (`ref_id1`) REFERENCES `ref_table1` (`id`) ,
+CONSTRAINT `FK_2` FOREIGN KEY (`ref_id2`) REFERENCES `ref_table2` (`id`)
+) ENGINE=InnoDB;
+SET FOREIGN_KEY_CHECKS=0;
+DROP INDEX `idx_1` ON `main`;
+SHOW TABLES;
+Tables_in_test
+main
+ref_table1
+ref_table2
+# restart and see if we can still access the main table
+SET FOREIGN_KEY_CHECKS=0;
+ALTER TABLE `main` ADD INDEX `idx_1` (`ref_id1`);
+SHOW CREATE TABLE `main`;
+Table	Create Table
+main	CREATE TABLE `main` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ref_id1` int(11) NOT NULL,
+  `ref_id2` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `FK_set_out_analysis_route_id` (`ref_id2`),
+  KEY `idx_1` (`ref_id1`),
+  CONSTRAINT `FK_1` FOREIGN KEY (`ref_id1`) REFERENCES `ref_table1` (`id`),
+  CONSTRAINT `FK_2` FOREIGN KEY (`ref_id2`) REFERENCES `ref_table2` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE  main, ref_table1, ref_table2;
--- a/mysql-test/suite/innodb/t/innodb_bug60229-master.opt
+++ b/mysql-test/suite/innodb/t/innodb_bug60229-master.opt
@@ -1 +0,0 @@
--lower_case_table_names=0
--- a/mysql-test/suite/innodb/t/innodb_bug60229.test
+++ b/mysql-test/suite/innodb/t/innodb_bug60229.test
@@ -2,6 +2,10 @@
 # Bug #13083023 - 60229: BROKEN COMPATIBILITY: ERROR WHILE CREATE TABLE
 # WITH FOREIGN KEY CONSTRAINT.

+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 -- source include/have_innodb.inc

 CREATE TABLE PERSON (
--- a/mysql-test/suite/innodb/t/innodb_bug68148.test
+++ b/mysql-test/suite/innodb/t/innodb_bug68148.test
@@ -0,0 +1,41 @@
+-- source include/have_innodb.inc
+-- source include/not_embedded.inc
+
+#
+# Bug #68148: drop index on a foreign key column leads to missing table
+# MDEV-8845: Table disappear after modifying FK
+#
+
+set global innodb_file_per_table=1;
+
+CREATE TABLE ref_table1 (id int(11) NOT NULL, PRIMARY KEY(id)) ENGINE=InnoDB; 
+
+CREATE TABLE ref_table2 (id int(11) NOT NULL, PRIMARY KEY(id)) ENGINE=InnoDB;
+
+CREATE TABLE `main` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ref_id1` int(11) NOT NULL,
+  `ref_id2` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `idx_1` (`ref_id1`,`ref_id2`),
+  KEY `FK_set_out_analysis_route_id` (`ref_id2`),
+  CONSTRAINT `FK_1` FOREIGN KEY (`ref_id1`) REFERENCES `ref_table1` (`id`) ,
+  CONSTRAINT `FK_2` FOREIGN KEY (`ref_id2`) REFERENCES `ref_table2` (`id`)
+) ENGINE=InnoDB;
+
+SET FOREIGN_KEY_CHECKS=0;
+
+DROP INDEX `idx_1` ON `main`;
+SHOW TABLES;
+
+--echo # restart and see if we can still access the main table
+--source include/restart_mysqld.inc
+
+# This is required to access the table
+SET FOREIGN_KEY_CHECKS=0;
+ALTER TABLE `main` ADD INDEX `idx_1` (`ref_id1`);
+SHOW CREATE TABLE `main`;
+
+DROP TABLE  main, ref_table1, ref_table2;
+
+
--- a/mysql-test/suite/innodb/t/xa_recovery.test
+++ b/mysql-test/suite/innodb/t/xa_recovery.test
@@ -6,6 +6,12 @@ if (`select plugin_auth_version <= "5.6.24" from information_schema.plugins wher
 # Embedded server does not support restarting.
 --source include/not_embedded.inc

+# MDEV-8841 - close tables opened by previous tests, 
+# so they don't get marked crashed when the server gets crashed
+--disable_query_log
+FLUSH TABLES;
+--enable_query_log
+
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
 connect (con1,localhost,root);
--- a/mysql-test/suite/jp/t/jp_enum_sjis-master.opt
+++ b/mysql-test/suite/jp/t/jp_enum_sjis-master.opt
@@ -1 +0,0 @@
--lower_case_table_names=0
--- a/mysql-test/suite/jp/t/jp_enum_sjis.test
+++ b/mysql-test/suite/jp/t/jp_enum_sjis.test
@@ -1,3 +1,7 @@
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/have_sjis.inc
 --source include/have_innodb.inc
 --character_set sjis
--- a/mysql-test/suite/jp/t/jp_enum_ucs2-master.opt
+++ b/mysql-test/suite/jp/t/jp_enum_ucs2-master.opt
@@ -1 +0,0 @@
--lower_case_table_names=0
--- a/mysql-test/suite/jp/t/jp_enum_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_enum_ucs2.test
@@ -1,3 +1,7 @@
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/have_ucs2.inc
 --source include/have_innodb.inc

--- a/mysql-test/suite/jp/t/jp_enum_ujis-master.opt
+++ b/mysql-test/suite/jp/t/jp_enum_ujis-master.opt
@@ -1 +0,0 @@
--lower_case_table_names=0
--- a/mysql-test/suite/jp/t/jp_enum_ujis.test
+++ b/mysql-test/suite/jp/t/jp_enum_ujis.test
@@ -1,3 +1,7 @@
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/have_ujis.inc
 --source include/have_innodb.inc

--- a/mysql-test/suite/jp/t/jp_enum_utf8-master.opt
+++ b/mysql-test/suite/jp/t/jp_enum_utf8-master.opt
@@ -1 +0,0 @@
--lower_case_table_names=0
--- a/mysql-test/suite/jp/t/jp_enum_utf8.test
+++ b/mysql-test/suite/jp/t/jp_enum_utf8.test
@@ -1,3 +1,7 @@
+#Server variable option 'lower_case_table_names' sets '0' as default value
+#in case sensitive filesystem. Using 'lower_case_table_names=0' in case of
+#insensitive filsystem is not allowed.
+-- source include/have_case_sensitive_file_system.inc
 --source include/have_utf8.inc
 --source include/have_innodb.inc
 --disable_warnings
--- a/mysql-test/suite/perfschema/r/query_cache.result
+++ b/mysql-test/suite/perfschema/r/query_cache.result
@@ -38,7 +38,7 @@ spins
 NULL
 select * from performance_schema.setup_timers where name='wait';
 NAME	TIMER_NAME
-wait	CYCLE
+wait	{CYCLE_OR_NANOSECOND}
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	1
@@ -53,7 +53,7 @@ spins
 NULL
 select * from performance_schema.setup_timers where name='wait';
 NAME	TIMER_NAME
-wait	CYCLE
+wait	{CYCLE_OR_NANOSECOND}
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	1
--- a/mysql-test/suite/perfschema/t/query_cache.test
+++ b/mysql-test/suite/perfschema/t/query_cache.test
@@ -34,6 +34,7 @@ show status like "Qcache_hits";

 select spins from performance_schema.events_waits_current order by event_name limit 1;

+--replace_result CYCLE {CYCLE_OR_NANOSECOND} NANOSECOND {CYCLE_OR_NANOSECOND}
 select * from performance_schema.setup_timers where name='wait';

 show status like "Qcache_queries_in_cache";
@@ -42,6 +43,7 @@ show status like "Qcache_hits";

 select spins from performance_schema.events_waits_current order by event_name limit 1;

+--replace_result CYCLE {CYCLE_OR_NANOSECOND} NANOSECOND {CYCLE_OR_NANOSECOND}
 select * from performance_schema.setup_timers where name='wait';

 show status like "Qcache_queries_in_cache";
--- a/mysql-test/suite/plugins/r/feedback_plugin_load.result
+++ b/mysql-test/suite/plugins/r/feedback_plugin_load.result
@@ -1,10 +1,13 @@
 select plugin_status from information_schema.plugins where plugin_name='feedback';
 plugin_status
 ACTIVE
+SELECT variable_value INTO @feedback_used FROM information_schema.feedback where variable_name = 'FEEDBACK used';
+SELECT variable_value = @feedback_used + 1 FROM information_schema.feedback where variable_name = 'FEEDBACK used';
+variable_value = @feedback_used + 1
+1
 select * from information_schema.feedback where variable_name like 'feed%'
-       and variable_name not like  '%_uid';
+       and variable_name not like  '%_uid' and variable_name not like 'FEEDBACK used';
 VARIABLE_NAME	VARIABLE_VALUE
-FEEDBACK used	1
 FEEDBACK version	1.1
 FEEDBACK_SEND_RETRY_WAIT	60
 FEEDBACK_SEND_TIMEOUT	60
--- a/mysql-test/suite/plugins/r/feedback_plugin_send.result
+++ b/mysql-test/suite/plugins/r/feedback_plugin_send.result
@@ -1,10 +1,13 @@
 select plugin_status from information_schema.plugins where plugin_name='feedback';
 plugin_status
 ACTIVE
+SELECT variable_value INTO @feedback_used FROM information_schema.feedback where variable_name = 'FEEDBACK used';
+SELECT variable_value = @feedback_used + 1 FROM information_schema.feedback where variable_name = 'FEEDBACK used';
+variable_value = @feedback_used + 1
+1
 select * from information_schema.feedback where variable_name like 'feed%'
-       and variable_name not like  '%_uid';
+       and variable_name not like  '%_uid' and variable_name not like 'FEEDBACK used';
 VARIABLE_NAME	VARIABLE_VALUE
-FEEDBACK used	3
 FEEDBACK version	1.1
 FEEDBACK_SEND_RETRY_WAIT	60
 FEEDBACK_SEND_TIMEOUT	60
--- a/mysql-test/suite/plugins/t/feedback_plugin_load.test
+++ b/mysql-test/suite/plugins/t/feedback_plugin_load.test
@@ -4,11 +4,27 @@ if (`select count(*) = 0 from information_schema.plugins where plugin_name = 'fe
 }

 select plugin_status from information_schema.plugins where plugin_name='feedback';
+
+# Every SELECT from INFORMATION_SCHEMA.FEEDBACK increases the value of 'FEEDBACK used'.
+# We cannot record the actual value, because the test can be executed more than once,
+# but we can check that the value indeed increases as expected.
+# There is still a room for some race condition, e.g. if at the very moment
+# between first SELECT to store the value and the next SELECT to check that it increases,
+# the feedback plugin is activated. But the probability of it is close to 0,
+# so lets get back to it if it ever happens.
+
+# Lets say the plugin was used X times before this SELECT
+SELECT variable_value INTO @feedback_used FROM information_schema.feedback where variable_name = 'FEEDBACK used';
+
+# Now $feedback_used == X+1, and 'FEEDBACK used' is also X+1. And variable_value is increased again when we run the next SELECT
+SELECT variable_value = @feedback_used + 1 FROM information_schema.feedback where variable_name = 'FEEDBACK used';
+
+# Now when we are happy with 'FEEDBACK used', we can check everything else
+
 --replace_result https http
 --sorted_result
 select * from information_schema.feedback where variable_name like 'feed%'
-       and variable_name not like  '%_uid';
-
+       and variable_name not like  '%_uid' and variable_name not like 'FEEDBACK used';

 # Embedded server does not use the table mysqld.user and thus
 # does not automatically use latin1_bin on startup. Use it manually.
--- a/mysql-test/suite/plugins/t/feedback_plugin_send.test
+++ b/mysql-test/suite/plugins/t/feedback_plugin_send.test
@@ -14,6 +14,15 @@ if (!$MTR_FEEDBACK_PLUGIN) {
 # is doing some work in other workers.
 #
 sleep 310;
+
+# The test expects that the plugin will send a report at least 2 times,
+# now (5 min after loading) and on server shutdown which happens below. 
+# Since we have already waited for 5 min, let's be generous
+# and make sure the server has enough time to shut down properly.
+# We won't lose anything if the shutdown is fast, but if it's slow, the plugin 
+# will still be able to finish the job and write about it in the error log.
+
+--let $shutdown_timeout= 60
 source include/restart_mysqld.inc;

 replace_result https http;
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug30888.opt
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug30888.opt
@@ -0,0 +1 @@
+--innodb-flush-log-at-trx-commit=2