database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.7' into 10.8

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-02-04 14:50:25 +01:00
parent c0f5fd2754 9ed8deb656
commit 4fb2cb1a30
907 changed files with 20182 additions and 6211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mysql-test/suite/json/r/json_table.result
View File

@@ -958,5 +958,32 @@ Warnings:
Warning 1264 Out of range value for column 'converted' at row 2
Warning 1366 Incorrect integer value: 'foo' for column ``.`(temporary)`.`converted` at row 3
#
# MDEV-27696 Json table columns accept redundant COLLATE syntax
#
SELECT * FROM json_table('[{"name":"str"}]', '$[*]'
COLUMNS (
name BLOB COLLATE `binary` PATH '$.name'
)
) AS jt;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'COLLATE `binary` PATH '$.name'
)
) AS jt' at line 3
SELECT * FROM json_table('[{"name":"str"}]', '$[*]'
COLUMNS (
name VARCHAR(10) COLLATE latin1_bin COLLATE latin1_swedish_ci PATH '$.name'
)
) AS jt;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'COLLATE latin1_swedish_ci PATH '$.name'
)
) AS jt' at line 3
SELECT * FROM json_table('[{"name":"str"}]', '$[*]'
COLUMNS (
name VARCHAR(10) BINARY COLLATE utf8_czech_ci path '$.name'
)
) AS jt;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'COLLATE utf8_czech_ci path '$.name'
)
) AS jt' at line 3
#
# End of 10.6 tests
#

22
mysql-test/suite/json/r/rpl_json_char.result Normal file
View File

@@ -0,0 +1,22 @@
include/master-slave.inc
[connection master]
#
# Start of 10.5 tests
#
#
# MDEV-27018 IF and COALESCE lose "json" property
#
CREATE TABLE t1 (a CHAR(100) CHECK(JSON_VALID(a)));
connection slave;
connection master;
INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
connection slave;
SELECT * FROM t1 ORDER BY a;
a
{"a": "b"}
connection master;
DROP TABLE t1;
#
# End of 10.5 tests
#
include/rpl_end.inc

22
mysql-test/suite/json/r/rpl_json_longtext.result Normal file
View File

@@ -0,0 +1,22 @@
include/master-slave.inc
[connection master]
#
# Start of 10.5 tests
#
#
# MDEV-27018 IF and COALESCE lose "json" property
#
CREATE TABLE t1 (a LONGTEXT CHECK(JSON_VALID(a)));
connection slave;
connection master;
INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
connection slave;
SELECT * FROM t1 ORDER BY a;
a
{"a": "b"}
connection master;
DROP TABLE t1;
#
# End of 10.5 tests
#
include/rpl_end.inc

22
mysql-test/suite/json/r/rpl_json_mediumtext.result Normal file
View File

@@ -0,0 +1,22 @@
include/master-slave.inc
[connection master]
#
# Start of 10.5 tests
#
#
# MDEV-27018 IF and COALESCE lose "json" property
#
CREATE TABLE t1 (a MEDIUMTEXT CHECK(JSON_VALID(a)));
connection slave;
connection master;
INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
connection slave;
SELECT * FROM t1 ORDER BY a;
a
{"a": "b"}
connection master;
DROP TABLE t1;
#
# End of 10.5 tests
#
include/rpl_end.inc

22
mysql-test/suite/json/r/rpl_json_text.result Normal file
View File

@@ -0,0 +1,22 @@
include/master-slave.inc
[connection master]
#
# Start of 10.5 tests
#
#
# MDEV-27018 IF and COALESCE lose "json" property
#
CREATE TABLE t1 (a TEXT CHECK(JSON_VALID(a)));
connection slave;
connection master;
INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
connection slave;
SELECT * FROM t1 ORDER BY a;
a
{"a": "b"}
connection master;
DROP TABLE t1;
#
# End of 10.5 tests
#
include/rpl_end.inc

22
mysql-test/suite/json/r/rpl_json_tinytext.result Normal file
View File

@@ -0,0 +1,22 @@
include/master-slave.inc
[connection master]
#
# Start of 10.5 tests
#
#
# MDEV-27018 IF and COALESCE lose "json" property
#
CREATE TABLE t1 (a TINYTEXT CHECK(JSON_VALID(a)));
connection slave;
connection master;
INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
connection slave;
SELECT * FROM t1 ORDER BY a;
a
{"a": "b"}
connection master;
DROP TABLE t1;
#
# End of 10.5 tests
#
include/rpl_end.inc

22
mysql-test/suite/json/r/rpl_json_varchar.result Normal file
View File

@@ -0,0 +1,22 @@
include/master-slave.inc
[connection master]
#
# Start of 10.5 tests
#
#
# MDEV-27018 IF and COALESCE lose "json" property
#
CREATE TABLE t1 (a VARCHAR(100) CHECK(JSON_VALID(a)));
connection slave;
connection master;
INSERT INTO t1 VALUES (JSON_OBJECT('a','b'));
connection slave;
SELECT * FROM t1 ORDER BY a;
a
{"a": "b"}
connection master;
DROP TABLE t1;
#
# End of 10.5 tests
#
include/rpl_end.inc

2884
mysql-test/suite/json/r/type_json.result Normal file
View File

File diff suppressed because it is too large Load Diff