Skip to content

Commit 95ffeff

Browse files
author
Joerg Bruehe
committed
Mergethe build tree of 5.6. back into main "trunk".
Both main and the build clone had received major changes in parallel, this resulted in Text conflict in mysql-test/r/type_temporal_fractional.result Text conflict in mysql-test/t/type_temporal_fractional.test Text conflict in storage/innobase/handler/ha_innodb.cc Text conflict in storage/innobase/handler/ha_innodb.h Text conflict in storage/innobase/handler/handler0alter.cc
2 parents 407d52e + f2f2b94 commit 95ffeff

17 files changed

Lines changed: 108 additions & 38 deletions

‎mysql-test/r/type_temporal_fractional.result‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16984,3 +16984,40 @@ SEC_TO_TIME(-3200399.000001)
1698416984
-838:59:59.000000
1698516985
Warnings:
1698616986
Warning 1292 Truncated incorrect time value: '-3200399.000001'
16987+
#
16988+
# BUG#13451866 - DIFFERENCE IN RESULTS WHEN USING
16989+
# EXTRACT( MINUTE_MICROSECOND )
16990+
#
16991+
CREATE TABLE t1 (a DATETIME(6) DEFAULT NULL);
16992+
INSERT INTO t1 VALUES ('0000-00-00 00:00:00.000000');
16993+
SELECT * FROM t1;
16994+
a
16995+
0000-00-00 00:00:00.000000
16996+
SELECT EXTRACT(MINUTE_MICROSECOND FROM a) FROM t1;
16997+
EXTRACT(MINUTE_MICROSECOND FROM a)
16998+
0
16999+
SELECT EXTRACT(MINUTE_MICROSECOND FROM '0000-00-00 00:00:00.000000');
17000+
EXTRACT(MINUTE_MICROSECOND FROM '0000-00-00 00:00:00.000000')
17001+
0
17002+
DROP TABLE t1;
17003+
#
17004+
# BUG#13436875 - ASSERTION '!ARGS[0]->IS_TEMPORAL() ||
17005+
# !ARGS[1]->IS_TEMPORAL()'
17006+
#
17007+
CREATE TABLE t1 (a DATETIME NOT NULL);
17008+
SELECT 1 FROM t1 WHERE GREATEST(a, a) / a;
17009+
1
17010+
SELECT 1 FROM t1 WHERE LEAST(a, a) / a;
17011+
1
17012+
SELECT 1 FROM t1 WHERE COALESCE(a, a) / a;
17013+
1
17014+
SELECT 1 FROM t1 WHERE IF(0, a, a) / a;
17015+
1
17016+
SELECT 1 FROM t1 WHERE IFNULL(a, a) / a;
17017+
1
17018+
SELECT 1 FROM t1 WHERE CASE WHEN 0 then a ELSE a END / a;
17019+
1
17020+
SELECT 1 FROM t1 WHERE (SELECT a FROM t1) / a;
17021+
1
17022+
DROP TABLE t1;
17023+
# End of 5.6 tests

‎mysql-test/suite/innodb/r/innodb_buffer_pool_load.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ count(*)
1616
SET GLOBAL innodb_buffer_pool_load_now = ON;
1717
SELECT variable_value
1818
FROM information_schema.global_status
19-
WHERE variable_name = 'INNODB_BUFFER_POOL_LOAD_STATUS';
19+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_load_status';
2020
variable_value
2121
Buffer pool(s) load completed at TIMESTAMP_NOW
2222
SELECT COUNT(*) FROM information_schema.innodb_buffer_page_lru

‎mysql-test/suite/innodb/t/innodb_buffer_pool_load.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ SET GLOBAL innodb_buffer_pool_dump_now = ON;
4747
let $wait_condition =
4848
SELECT SUBSTR(variable_value, 1, 33) = 'Buffer pool(s) dump completed at '
4949
FROM information_schema.global_status
50-
WHERE variable_name = 'INNODB_BUFFER_POOL_DUMP_STATUS';
50+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
5151
-- source include/wait_condition.inc
5252

5353
# Confirm the file has been created
@@ -76,14 +76,14 @@ SET GLOBAL innodb_buffer_pool_load_now = ON;
7676
let $wait_condition =
7777
SELECT SUBSTR(variable_value, 1, 33) = 'Buffer pool(s) load completed at '
7878
FROM information_schema.global_status
79-
WHERE variable_name = 'INNODB_BUFFER_POOL_LOAD_STATUS';
79+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_load_status';
8080
-- source include/wait_condition.inc
8181

8282
# Show the status, interesting if the above timed out
8383
-- replace_regex /[0-9]{6}[[:space:]]+[0-9]{1,2}:[0-9]{2}:[0-9]{2}/TIMESTAMP_NOW/
8484
SELECT variable_value
8585
FROM information_schema.global_status
86-
WHERE variable_name = 'INNODB_BUFFER_POOL_LOAD_STATUS';
86+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_load_status';
8787

8888
# Accept 329 for 16k page size, 662 for 8k page size & 1392 for 4k page size
8989
-- replace_result 329 {checked_valid} 662 {checked_valid} 1392 {checked_valid}
@@ -107,7 +107,7 @@ SET GLOBAL innodb_buffer_pool_load_now = ON;
107107
let $wait_condition =
108108
SELECT SUBSTR(variable_value, 1, 13) = 'Error parsing'
109109
FROM information_schema.global_status
110-
WHERE variable_name = 'INNODB_BUFFER_POOL_LOAD_STATUS';
110+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_load_status';
111111
-- source include/wait_condition.inc
112112

113113
DROP TABLE ib_bp_test;

‎mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SELECT @orig;
44
ib_buffer_pool
55
SELECT variable_value
66
FROM information_schema.global_status
7-
WHERE variable_name = 'INNODB_BUFFER_POOL_DUMP_STATUS';
7+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
88
variable_value
99
not started
1010
SET GLOBAL innodb_buffer_pool_filename = 'innodb_foobar_dump';

‎mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_now_basic.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ SET GLOBAL innodb_buffer_pool_dump_now = ON;
66
SET GLOBAL innodb_buffer_pool_load_now = ON;
77
SELECT variable_value
88
FROM information_schema.global_status
9-
WHERE variable_name = 'INNODB_BUFFER_POOL_LOAD_STATUS';
9+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_load_status';
1010
variable_value
1111
Buffer pool(s) load completed at TIMESTAMP_NOW

‎mysql-test/suite/sys_vars/t/innodb_adaptive_max_sleep_delay_basic.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
--source include/have_innodb.inc
2121

2222
# Check if builtins are enabled
23-
if (`SELECT VARIABLE_VALUE='OFF' FROM INFORMATION_SCHEMA.GLOBAL_STATUS
24-
WHERE variable_name = 'INNODB_HAVE_ATOMIC_BUILTINS'`) {
23+
if (`SELECT LOWER(VARIABLE_VALUE)='off' FROM INFORMATION_SCHEMA.GLOBAL_STATUS
24+
WHERE LOWER(variable_name) = 'innodb_have_atomic_builtins'`) {
2525
--skip Test requires InnoDB atomic builtins
2626
}
2727

‎mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_now_basic.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SELECT @@global.innodb_buffer_pool_dump_now;
1717
let $wait_condition =
1818
SELECT SUBSTR(variable_value, 1, 33) = 'Buffer pool(s) dump completed at '
1919
FROM information_schema.global_status
20-
WHERE variable_name = 'INNODB_BUFFER_POOL_DUMP_STATUS';
20+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
2121
-- source include/wait_condition.inc
2222

2323
# Confirm that the dump file has been created

‎mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SELECT @orig;
1515
# dump actually being complete and file_exists may fail.
1616
SELECT variable_value
1717
FROM information_schema.global_status
18-
WHERE variable_name = 'INNODB_BUFFER_POOL_DUMP_STATUS';
18+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
1919

2020
# Try with a non-default filename
2121

@@ -28,7 +28,7 @@ SET GLOBAL innodb_buffer_pool_dump_now = ON;
2828
let $wait_condition =
2929
SELECT SUBSTR(variable_value, 1, 33) = 'Buffer pool(s) dump completed at '
3030
FROM information_schema.global_status
31-
WHERE variable_name = 'INNODB_BUFFER_POOL_DUMP_STATUS';
31+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
3232
-- source include/wait_condition.inc
3333

3434
-- file_exists $file

‎mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ SET GLOBAL innodb_buffer_pool_dump_now = ON;
1515
let $wait_condition =
1616
SELECT SUBSTR(variable_value, 1, 33) = 'Buffer pool(s) dump completed at '
1717
FROM information_schema.global_status
18-
WHERE variable_name = 'INNODB_BUFFER_POOL_DUMP_STATUS';
18+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_dump_status';
1919
-- source include/wait_condition.inc
2020

2121
# Confirm the file is really created
@@ -29,11 +29,11 @@ SET GLOBAL innodb_buffer_pool_load_now = ON;
2929
let $wait_condition =
3030
SELECT SUBSTR(variable_value, 1, 33) = 'Buffer pool(s) load completed at '
3131
FROM information_schema.global_status
32-
WHERE variable_name = 'INNODB_BUFFER_POOL_LOAD_STATUS';
32+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_load_status';
3333
-- source include/wait_condition.inc
3434

3535
# Show the status, interesting if the above timed out
3636
-- replace_regex /[0-9]{6}[[:space:]]+[0-9]{1,2}:[0-9]{2}:[0-9]{2}/TIMESTAMP_NOW/
3737
SELECT variable_value
3838
FROM information_schema.global_status
39-
WHERE variable_name = 'INNODB_BUFFER_POOL_LOAD_STATUS';
39+
WHERE LOWER(variable_name) = 'innodb_buffer_pool_load_status';

‎mysql-test/t/type_temporal_fractional.test‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7488,3 +7488,33 @@ SELECT SEC_TO_TIME(3200399.999999);
74887488
SELECT SEC_TO_TIME(3200399.000001);
74897489
SELECT SEC_TO_TIME(-3200399.999999);
74907490
SELECT SEC_TO_TIME(-3200399.000001);
7491+
7492+
7493+
--echo #
7494+
--echo # BUG#13451866 - DIFFERENCE IN RESULTS WHEN USING
7495+
--echo # EXTRACT( MINUTE_MICROSECOND )
7496+
--echo #
7497+
CREATE TABLE t1 (a DATETIME(6) DEFAULT NULL);
7498+
INSERT INTO t1 VALUES ('0000-00-00 00:00:00.000000');
7499+
SELECT * FROM t1;
7500+
SELECT EXTRACT(MINUTE_MICROSECOND FROM a) FROM t1;
7501+
SELECT EXTRACT(MINUTE_MICROSECOND FROM '0000-00-00 00:00:00.000000');
7502+
DROP TABLE t1;
7503+
7504+
7505+
--echo #
7506+
--echo # BUG#13436875 - ASSERTION '!ARGS[0]->IS_TEMPORAL() ||
7507+
--echo # !ARGS[1]->IS_TEMPORAL()'
7508+
--echo #
7509+
CREATE TABLE t1 (a DATETIME NOT NULL);
7510+
SELECT 1 FROM t1 WHERE GREATEST(a, a) / a;
7511+
SELECT 1 FROM t1 WHERE LEAST(a, a) / a;
7512+
SELECT 1 FROM t1 WHERE COALESCE(a, a) / a;
7513+
SELECT 1 FROM t1 WHERE IF(0, a, a) / a;
7514+
SELECT 1 FROM t1 WHERE IFNULL(a, a) / a;
7515+
SELECT 1 FROM t1 WHERE CASE WHEN 0 then a ELSE a END / a;
7516+
SELECT 1 FROM t1 WHERE (SELECT a FROM t1) / a;
7517+
DROP TABLE t1;
7518+
7519+
7520+
--echo # End of 5.6 tests

0 commit comments

Comments
 (0)