mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 03:47:17 +02:00
merge with mysql-5.5.30 minus few incorrect or not applicable changesets
This commit is contained in:
commit
8161c6772d
178 changed files with 3564 additions and 2042 deletions
|
|
@ -5,19 +5,19 @@
|
|||
CREATE TABLE t1 (
|
||||
`a` int(11) DEFAULT NULL,
|
||||
`col432` bit(8) DEFAULT NULL,
|
||||
`col433` multipoint DEFAULT NULL,
|
||||
`col434` polygon DEFAULT NULL,
|
||||
`col433` geometry DEFAULT NULL,
|
||||
`col434` geometry DEFAULT NULL,
|
||||
`col435` decimal(50,17) unsigned DEFAULT NULL,
|
||||
`col436` geometry NOT NULL,
|
||||
`col437` tinyblob NOT NULL,
|
||||
`col438` multipolygon DEFAULT NULL,
|
||||
`col438` geometry DEFAULT NULL,
|
||||
`col439` mediumblob NOT NULL,
|
||||
`col440` tinyblob NOT NULL,
|
||||
`col441` double unsigned DEFAULT NULL
|
||||
);
|
||||
|
||||
CREATE TABLE t2 (
|
||||
`a` multipoint DEFAULT NULL,
|
||||
`a` geometry DEFAULT NULL,
|
||||
`col460` date DEFAULT NULL,
|
||||
`col461` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
`col462` date NOT NULL,
|
||||
|
|
@ -34,7 +34,7 @@ CREATE TABLE t3 (
|
|||
`col579` bit(38) NOT NULL,
|
||||
`col580` varchar(93) NOT NULL,
|
||||
`col581` datetime DEFAULT NULL,
|
||||
`col583` multipolygon DEFAULT NULL,
|
||||
`col583` geometry DEFAULT NULL,
|
||||
`col584` bit(47) NOT NULL
|
||||
);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue