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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2022-09-20 16:53:20 +03:00
parent 5d9d379329 0792aff161
commit 44fd2c4b24
1152 changed files with 30607 additions and 29546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/main/func_misc.result
View File

@ -120,14 +120,14 @@ Table Create Table
t1 CREATE TABLE `t1` (
`uuid()` varchar(36) DEFAULT NULL,
`length(uuid())` int(10) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop table t1;
create table t1 select INET_ATON('255.255.0.1') as `a`;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bigint(21) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop table t1;
drop table if exists table_26093;
drop function if exists func_26093_a;
@ -1538,7 +1538,7 @@ t1 CREATE TABLE `t1` (
`a1` varchar(30) DEFAULT inet_ntoa(`b`),
`c` int(11) DEFAULT is_ipv4(`a`),
`d` int(11) DEFAULT is_ipv6(`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
INSERT INTO t1 (a) VALUES ('192.168.001.001'),('::1'),('xxx');
SELECT * FROM t1;
a b a1 c d
@ -1561,7 +1561,7 @@ t1 CREATE TABLE `t1` (
`str1` varchar(128) DEFAULT inet6_ntoa(`addr`),
`b` int(11) DEFAULT is_ipv4_compat(`addr`),
`c` int(11) DEFAULT is_ipv4_mapped(`addr`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
INSERT INTO t1 (str) VALUES ('::FFFF:192.168.0.1'),('::10.0.5.9');
SELECT str, str1, b,c FROM t1;
str str1 b c
@ -1621,7 +1621,7 @@ Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) unsigned NOT NULL,
`c2` bigint(20) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
SELECT * FROM t1;
c1 c2
18446744073709551615 18446744073709551615